From c866c211b53c7bb2bfd96af69f2144073aa8f101 Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Fri, 17 Nov 2023 13:48:01 -0700 Subject: [PATCH 01/20] Make static str and SharedString implement Element --- crates/gpui2/src/elements/text.rs | 138 +++++++++++++++++++++++++++++- 1 file changed, 136 insertions(+), 2 deletions(-) diff --git a/crates/gpui2/src/elements/text.rs b/crates/gpui2/src/elements/text.rs index 6849a89711..9e8256014e 100644 --- a/crates/gpui2/src/elements/text.rs +++ b/crates/gpui2/src/elements/text.rs @@ -1,12 +1,72 @@ use crate::{ AnyElement, BorrowWindow, Bounds, Component, Element, ElementId, LayoutId, Pixels, - SharedString, Size, TextRun, ViewContext, WrappedLine, + SharedString, Size, TextRun, ViewContext, WindowContext, WrappedLine, }; +use anyhow::anyhow; use parking_lot::{Mutex, MutexGuard}; use smallvec::SmallVec; use std::{cell::Cell, rc::Rc, sync::Arc}; use util::ResultExt; +impl Element for &'static str { + type ElementState = TextState; + + fn element_id(&self) -> Option { + None + } + + fn layout( + &mut self, + _: &mut V, + _: Option, + cx: &mut ViewContext, + ) -> (LayoutId, Self::ElementState) { + let mut state = TextState::default(); + let layout_id = state.layout(SharedString::from(*self), None, cx); + (layout_id, state) + } + + fn paint( + &mut self, + bounds: Bounds, + _: &mut V, + state: &mut TextState, + cx: &mut ViewContext, + ) { + state.paint(bounds, self, cx) + } +} + +impl Element for SharedString { + type ElementState = TextState; + + fn element_id(&self) -> Option { + Some(self.clone().into()) + } + + fn layout( + &mut self, + _: &mut V, + _: Option, + cx: &mut ViewContext, + ) -> (LayoutId, Self::ElementState) { + let mut state = TextState::default(); + let layout_id = state.layout(self.clone(), None, cx); + (layout_id, state) + } + + fn paint( + &mut self, + bounds: Bounds, + _: &mut V, + state: &mut TextState, + cx: &mut ViewContext, + ) { + let text_str: &str = self.as_ref(); + state.paint(bounds, text_str, cx) + } +} + pub struct Text { text: SharedString, runs: Option>, @@ -109,7 +169,7 @@ impl Element for Text { let element_state = element_state.lock(); let element_state = element_state .as_ref() - .ok_or_else(|| anyhow::anyhow!("measurement has not been performed on {}", &self.text)) + .ok_or_else(|| anyhow!("measurement has not been performed on {}", &self.text)) .unwrap(); let line_height = element_state.line_height; @@ -128,6 +188,80 @@ impl TextState { fn lock(&self) -> MutexGuard> { self.0.lock() } + + fn layout( + &mut self, + text: SharedString, + runs: Option>, + cx: &mut WindowContext, + ) -> LayoutId { + let text_system = cx.text_system().clone(); + let text_style = cx.text_style(); + let font_size = text_style.font_size.to_pixels(cx.rem_size()); + let line_height = text_style + .line_height + .to_pixels(font_size.into(), cx.rem_size()); + let text = SharedString::from(text); + + let rem_size = cx.rem_size(); + + let runs = if let Some(runs) = runs { + runs + } else { + vec![text_style.to_run(text.len())] + }; + + let layout_id = cx.request_measured_layout(Default::default(), rem_size, { + let element_state = self.clone(); + move |known_dimensions, _| { + let Some(lines) = text_system + .shape_text( + &text, + font_size, + &runs[..], + known_dimensions.width, // Wrap if we know the width. + ) + .log_err() + else { + element_state.lock().replace(TextStateInner { + lines: Default::default(), + line_height, + }); + return Size::default(); + }; + + let mut size: Size = Size::default(); + for line in &lines { + let line_size = line.size(line_height); + size.height += line_size.height; + size.width = size.width.max(line_size.width); + } + + element_state + .lock() + .replace(TextStateInner { lines, line_height }); + + size + } + }); + + layout_id + } + + fn paint(&mut self, bounds: Bounds, text: &str, cx: &mut WindowContext) { + let element_state = self.lock(); + let element_state = element_state + .as_ref() + .ok_or_else(|| anyhow!("measurement has not been performed on {}", text)) + .unwrap(); + + let line_height = element_state.line_height; + let mut line_origin = bounds.origin; + for line in &element_state.lines { + line.paint(line_origin, line_height, cx).log_err(); + line_origin.y += line.size(line_height).height; + } + } } struct TextStateInner { From ec3bb0f090cb1333f7406b1af44d970939357648 Mon Sep 17 00:00:00 2001 From: Conrad Irwin Date: Fri, 17 Nov 2023 14:11:39 -0700 Subject: [PATCH 02/20] Focus workspace on launch Fixes action dispatch when no focus is there. --- crates/zed2/src/zed2.rs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/crates/zed2/src/zed2.rs b/crates/zed2/src/zed2.rs index 84cacccb5a..e7be98d45b 100644 --- a/crates/zed2/src/zed2.rs +++ b/crates/zed2/src/zed2.rs @@ -10,8 +10,8 @@ pub use assets::*; use collections::VecDeque; use editor::{Editor, MultiBuffer}; use gpui::{ - actions, point, px, AppContext, Context, PromptLevel, TitlebarOptions, ViewContext, - VisualContext, WindowBounds, WindowKind, WindowOptions, + actions, point, px, AppContext, Context, FocusableView, PromptLevel, TitlebarOptions, + ViewContext, VisualContext, WindowBounds, WindowKind, WindowOptions, }; pub use only_instance::*; pub use open_listener::*; @@ -425,6 +425,8 @@ pub fn initialize_workspace(app_state: Arc, cx: &mut AppContext) { } } }); + + workspace.focus_handle(cx).focus(cx); //todo!() // load_default_keymap(cx); }) From 0069dd5ce67981428d4ceae3b191b9083725a30b Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Fri, 17 Nov 2023 20:05:37 -0700 Subject: [PATCH 03/20] WIP --- crates/gpui2/src/element.rs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/crates/gpui2/src/element.rs b/crates/gpui2/src/element.rs index b4b1af630e..26232620d9 100644 --- a/crates/gpui2/src/element.rs +++ b/crates/gpui2/src/element.rs @@ -5,7 +5,7 @@ use derive_more::{Deref, DerefMut}; pub(crate) use smallvec::SmallVec; use std::{any::Any, fmt::Debug, mem}; -pub trait Element { +pub trait Element: 'static + Sized { type ElementState: 'static; fn element_id(&self) -> Option; @@ -25,6 +25,10 @@ pub trait Element { cx: &mut ViewContext, ); + fn into_any(self) -> AnyElement { + AnyElement::new(self) + } + fn draw( self, origin: Point, @@ -34,7 +38,6 @@ pub trait Element { f: impl FnOnce(&Self::ElementState, &mut ViewContext) -> R, ) -> R where - Self: Sized, T: Clone + Default + Debug + Into, { let mut element = RenderedElement { From 2515bbf990096839dbaffe338d1ae65f6ca02c80 Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Fri, 17 Nov 2023 23:32:55 -0700 Subject: [PATCH 04/20] Move self in Element::paint Remove mutable state borrows in favor of state ownership in render processes to streamline element rendering. --- crates/editor2/src/element.rs | 20 +- crates/gpui2/src/app.rs | 10 +- crates/gpui2/src/app/entity_map.rs | 10 +- crates/gpui2/src/element.rs | 219 +++++++++++++--------- crates/gpui2/src/elements/div.rs | 58 +++--- crates/gpui2/src/elements/img.rs | 10 +- crates/gpui2/src/elements/overlay.rs | 12 +- crates/gpui2/src/elements/svg.rs | 10 +- crates/gpui2/src/elements/text.rs | 36 ++-- crates/gpui2/src/elements/uniform_list.rs | 27 ++- crates/gpui2/src/gpui2.rs | 2 - crates/gpui2/src/view.rs | 53 +++--- crates/gpui2/src/window.rs | 4 +- crates/gpui2_macros/src/gpui2_macros.rs | 6 + crates/ui2/src/components/context_menu.rs | 16 +- 15 files changed, 262 insertions(+), 231 deletions(-) diff --git a/crates/editor2/src/element.rs b/crates/editor2/src/element.rs index 3de5389b1f..2de9182901 100644 --- a/crates/editor2/src/element.rs +++ b/crates/editor2/src/element.rs @@ -488,8 +488,8 @@ impl EditorElement { } } - for (ix, fold_indicator) in layout.fold_indicators.iter_mut().enumerate() { - if let Some(fold_indicator) = fold_indicator.as_mut() { + for (ix, fold_indicator) in layout.fold_indicators.drain(..).enumerate() { + if let Some(mut fold_indicator) = fold_indicator { let available_space = size( AvailableSpace::MinContent, AvailableSpace::Definite(line_height * 0.55), @@ -509,7 +509,7 @@ impl EditorElement { } } - if let Some(indicator) = layout.code_actions_indicator.as_mut() { + if let Some(mut indicator) = layout.code_actions_indicator.take() { let available_space = size( AvailableSpace::MinContent, AvailableSpace::Definite(line_height), @@ -840,7 +840,7 @@ impl EditorElement { } }); - if let Some((position, context_menu)) = layout.context_menu.as_mut() { + if let Some((position, mut context_menu)) = layout.context_menu.take() { cx.with_z_index(1, |cx| { let line_height = self.style.text.line_height_in_pixels(cx.rem_size()); let available_space = size( @@ -1224,7 +1224,7 @@ impl EditorElement { let scroll_left = scroll_position.x * layout.position_map.em_width; let scroll_top = scroll_position.y * layout.position_map.line_height; - for block in &mut layout.blocks { + for block in layout.blocks.drain(..) { let mut origin = bounds.origin + point( Pixels::ZERO, @@ -2389,7 +2389,7 @@ enum Invisible { } impl Element for EditorElement { - type ElementState = (); + type State = (); fn element_id(&self) -> Option { Some(self.editor_id.into()) @@ -2398,9 +2398,9 @@ impl Element for EditorElement { fn layout( &mut self, editor: &mut Editor, - element_state: Option, + element_state: Option, cx: &mut gpui::ViewContext, - ) -> (gpui::LayoutId, Self::ElementState) { + ) -> (gpui::LayoutId, Self::State) { editor.style = Some(self.style.clone()); // Long-term, we'd like to eliminate this. let rem_size = cx.rem_size(); @@ -2416,10 +2416,10 @@ impl Element for EditorElement { } fn paint( - &mut self, + mut self, bounds: Bounds, editor: &mut Editor, - element_state: &mut Self::ElementState, + element_state: &mut Self::State, cx: &mut gpui::ViewContext, ) { let mut layout = self.compute_layout(editor, cx, bounds); diff --git a/crates/gpui2/src/app.rs b/crates/gpui2/src/app.rs index b5083b97c2..397b770c2b 100644 --- a/crates/gpui2/src/app.rs +++ b/crates/gpui2/src/app.rs @@ -14,7 +14,7 @@ use smallvec::SmallVec; pub use test_context::*; use crate::{ - current_platform, image_cache::ImageCache, Action, ActionRegistry, AnyBox, AnyView, + current_platform, image_cache::ImageCache, Action, ActionRegistry, Any, AnyView, AnyWindowHandle, AppMetadata, AssetSource, BackgroundExecutor, ClipboardItem, Context, DispatchPhase, DisplayId, Entity, EventEmitter, FocusEvent, FocusHandle, FocusId, ForegroundExecutor, KeyBinding, Keymap, LayoutId, PathPromptOptions, Pixels, Platform, @@ -28,7 +28,7 @@ use futures::{channel::oneshot, future::LocalBoxFuture, Future}; use parking_lot::Mutex; use slotmap::SlotMap; use std::{ - any::{type_name, Any, TypeId}, + any::{type_name, TypeId}, cell::{Ref, RefCell, RefMut}, marker::PhantomData, mem, @@ -194,7 +194,7 @@ pub struct AppContext { asset_source: Arc, pub(crate) image_cache: ImageCache, pub(crate) text_style_stack: Vec, - pub(crate) globals_by_type: HashMap, + pub(crate) globals_by_type: HashMap>, pub(crate) entities: EntityMap, pub(crate) new_view_observers: SubscriberSet, pub(crate) windows: SlotMap>, @@ -1100,12 +1100,12 @@ pub(crate) enum Effect { /// Wraps a global variable value during `update_global` while the value has been moved to the stack. pub(crate) struct GlobalLease { - global: AnyBox, + global: Box, global_type: PhantomData, } impl GlobalLease { - fn new(global: AnyBox) -> Self { + fn new(global: Box) -> Self { GlobalLease { global, global_type: PhantomData, diff --git a/crates/gpui2/src/app/entity_map.rs b/crates/gpui2/src/app/entity_map.rs index 4a3cca040b..e909e50b10 100644 --- a/crates/gpui2/src/app/entity_map.rs +++ b/crates/gpui2/src/app/entity_map.rs @@ -1,10 +1,10 @@ -use crate::{private::Sealed, AnyBox, AppContext, Context, Entity, ModelContext}; +use crate::{private::Sealed, AppContext, Context, Entity, ModelContext}; use anyhow::{anyhow, Result}; use derive_more::{Deref, DerefMut}; use parking_lot::{RwLock, RwLockUpgradableReadGuard}; use slotmap::{SecondaryMap, SlotMap}; use std::{ - any::{type_name, TypeId}, + any::{type_name, Any, TypeId}, fmt::{self, Display}, hash::{Hash, Hasher}, marker::PhantomData, @@ -31,7 +31,7 @@ impl Display for EntityId { } pub(crate) struct EntityMap { - entities: SecondaryMap, + entities: SecondaryMap>, ref_counts: Arc>, } @@ -101,7 +101,7 @@ impl EntityMap { ); } - pub fn take_dropped(&mut self) -> Vec<(EntityId, AnyBox)> { + pub fn take_dropped(&mut self) -> Vec<(EntityId, Box)> { let mut ref_counts = self.ref_counts.write(); let dropped_entity_ids = mem::take(&mut ref_counts.dropped_entity_ids); @@ -121,7 +121,7 @@ impl EntityMap { } pub struct Lease<'a, T> { - entity: Option, + entity: Option>, pub model: &'a Model, entity_type: PhantomData, } diff --git a/crates/gpui2/src/element.rs b/crates/gpui2/src/element.rs index 26232620d9..b9d312755a 100644 --- a/crates/gpui2/src/element.rs +++ b/crates/gpui2/src/element.rs @@ -3,25 +3,25 @@ use crate::{ }; use derive_more::{Deref, DerefMut}; pub(crate) use smallvec::SmallVec; -use std::{any::Any, fmt::Debug, mem}; +use std::{any::Any, fmt::Debug}; pub trait Element: 'static + Sized { - type ElementState: 'static; + type State: 'static; fn element_id(&self) -> Option; fn layout( &mut self, view_state: &mut V, - element_state: Option, + element_state: Option, cx: &mut ViewContext, - ) -> (LayoutId, Self::ElementState); + ) -> (LayoutId, Self::State); fn paint( - &mut self, + self, bounds: Bounds, view_state: &mut V, - element_state: &mut Self::ElementState, + element_state: &mut Self::State, cx: &mut ViewContext, ); @@ -35,32 +35,26 @@ pub trait Element: 'static + Sized { available_space: Size, view_state: &mut V, cx: &mut ViewContext, - f: impl FnOnce(&Self::ElementState, &mut ViewContext) -> R, + f: impl FnOnce(&mut Self::State, &mut ViewContext) -> R, ) -> R where T: Clone + Default + Debug + Into, { - let mut element = RenderedElement { - element: self, - phase: ElementRenderPhase::Start, + let element_id = self.element_id(); + let element = DrawableElement { + element: Some(self), + phase: ElementDrawPhase::Start, }; - element.draw(origin, available_space.map(Into::into), view_state, cx); - if let ElementRenderPhase::Painted { frame_state } = &element.phase { - if let Some(frame_state) = frame_state.as_ref() { - f(&frame_state, cx) - } else { - let element_id = element - .element - .element_id() - .expect("we either have some frame_state or some element_id"); - cx.with_element_state(element_id, |element_state, cx| { - let element_state = element_state.unwrap(); - let result = f(&element_state, cx); - (result, element_state) - }) - } + let frame_state = element.draw(origin, available_space.map(Into::into), view_state, cx); + + if let Some(mut frame_state) = frame_state { + f(&mut frame_state, cx) } else { - unreachable!() + cx.with_element_state(element_id.unwrap(), |element_state, cx| { + let mut element_state = element_state.unwrap(); + let result = f(&mut element_state, cx); + (result, element_state) + }) } } } @@ -107,13 +101,13 @@ trait ElementObject { ); } -struct RenderedElement> { - element: E, - phase: ElementRenderPhase, +pub struct DrawableElement> { + element: Option, + phase: ElementDrawPhase, } #[derive(Default)] -enum ElementRenderPhase { +enum ElementDrawPhase { #[default] Start, LayoutRequested { @@ -125,83 +119,83 @@ enum ElementRenderPhase { available_space: Size, frame_state: Option, }, - Painted { - frame_state: Option, - }, } /// Internal struct that wraps an element to store Layout and ElementState after the element is rendered. /// It's allocated as a trait object to erase the element type and wrapped in AnyElement for /// improved usability. -impl> RenderedElement { +impl> DrawableElement { fn new(element: E) -> Self { - RenderedElement { - element, - phase: ElementRenderPhase::Start, + DrawableElement { + element: Some(element), + phase: ElementDrawPhase::Start, } } -} -impl ElementObject for RenderedElement -where - E: Element, - E::ElementState: 'static, -{ fn layout(&mut self, state: &mut V, cx: &mut ViewContext) -> LayoutId { - let (layout_id, frame_state) = match mem::take(&mut self.phase) { - ElementRenderPhase::Start => { - if let Some(id) = self.element.element_id() { - let layout_id = cx.with_element_state(id, |element_state, cx| { - self.element.layout(state, element_state, cx) - }); - (layout_id, None) - } else { - let (layout_id, frame_state) = self.element.layout(state, None, cx); - (layout_id, Some(frame_state)) - } - } - ElementRenderPhase::LayoutRequested { .. } - | ElementRenderPhase::LayoutComputed { .. } - | ElementRenderPhase::Painted { .. } => { - panic!("element rendered twice") - } + let (layout_id, frame_state) = if let Some(id) = self.element.as_ref().unwrap().element_id() + { + let layout_id = cx.with_element_state(id, |element_state, cx| { + self.element + .as_mut() + .unwrap() + .layout(state, element_state, cx) + }); + (layout_id, None) + } else { + let (layout_id, frame_state) = self.element.as_mut().unwrap().layout(state, None, cx); + (layout_id, Some(frame_state)) }; - self.phase = ElementRenderPhase::LayoutRequested { + self.phase = ElementDrawPhase::LayoutRequested { layout_id, frame_state, }; layout_id } - fn paint(&mut self, view_state: &mut V, cx: &mut ViewContext) { - self.phase = match mem::take(&mut self.phase) { - ElementRenderPhase::LayoutRequested { + fn paint(mut self, view_state: &mut V, cx: &mut ViewContext) -> Option { + match self.phase { + ElementDrawPhase::LayoutRequested { layout_id, - mut frame_state, + frame_state, } - | ElementRenderPhase::LayoutComputed { + | ElementDrawPhase::LayoutComputed { layout_id, - mut frame_state, + frame_state, .. } => { let bounds = cx.layout_bounds(layout_id); - if let Some(id) = self.element.element_id() { - cx.with_element_state(id, |element_state, cx| { + + if let Some(mut frame_state) = frame_state { + self.element + .take() + .unwrap() + .paint(bounds, view_state, &mut frame_state, cx); + Some(frame_state) + } else { + let element_id = self + .element + .as_ref() + .unwrap() + .element_id() + .expect("if we don't have frame state, we should have element state"); + cx.with_element_state(element_id, |element_state, cx| { let mut element_state = element_state.unwrap(); - self.element - .paint(bounds, view_state, &mut element_state, cx); + self.element.take().unwrap().paint( + bounds, + view_state, + &mut element_state, + cx, + ); ((), element_state) }); - } else { - self.element - .paint(bounds, view_state, frame_state.as_mut().unwrap(), cx); + None } - ElementRenderPhase::Painted { frame_state } } _ => panic!("must call layout before paint"), - }; + } } fn measure( @@ -210,25 +204,25 @@ where view_state: &mut V, cx: &mut ViewContext, ) -> Size { - if matches!(&self.phase, ElementRenderPhase::Start) { + if matches!(&self.phase, ElementDrawPhase::Start) { self.layout(view_state, cx); } let layout_id = match &mut self.phase { - ElementRenderPhase::LayoutRequested { + ElementDrawPhase::LayoutRequested { layout_id, frame_state, } => { cx.compute_layout(*layout_id, available_space); let layout_id = *layout_id; - self.phase = ElementRenderPhase::LayoutComputed { + self.phase = ElementDrawPhase::LayoutComputed { layout_id, available_space, frame_state: frame_state.take(), }; layout_id } - ElementRenderPhase::LayoutComputed { + ElementDrawPhase::LayoutComputed { layout_id, available_space: prev_available_space, .. @@ -245,6 +239,40 @@ where cx.layout_bounds(layout_id).size } + fn draw( + mut self, + origin: Point, + available_space: Size, + view_state: &mut V, + cx: &mut ViewContext, + ) -> Option { + self.measure(available_space, view_state, cx); + cx.with_absolute_element_offset(origin, |cx| self.paint(view_state, cx)) + } +} + +impl ElementObject for Option> +where + E: Element, + E::State: 'static, +{ + fn layout(&mut self, view_state: &mut V, cx: &mut ViewContext) -> LayoutId { + DrawableElement::layout(self.as_mut().unwrap(), view_state, cx) + } + + fn paint(&mut self, view_state: &mut V, cx: &mut ViewContext) { + DrawableElement::paint(self.take().unwrap(), view_state, cx); + } + + fn measure( + &mut self, + available_space: Size, + view_state: &mut V, + cx: &mut ViewContext, + ) -> Size { + DrawableElement::measure(self.as_mut().unwrap(), available_space, view_state, cx) + } + fn draw( &mut self, origin: Point, @@ -252,8 +280,13 @@ where view_state: &mut V, cx: &mut ViewContext, ) { - self.measure(available_space, view_state, cx); - cx.with_absolute_element_offset(origin, |cx| self.paint(view_state, cx)) + DrawableElement::draw( + self.take().unwrap(), + origin, + available_space, + view_state, + cx, + ); } } @@ -264,16 +297,16 @@ impl AnyElement { where V: 'static, E: 'static + Element, - E::ElementState: Any, + E::State: Any, { - AnyElement(Box::new(RenderedElement::new(element))) + AnyElement(Box::new(Some(DrawableElement::new(element))) as Box>) } pub fn layout(&mut self, view_state: &mut V, cx: &mut ViewContext) -> LayoutId { self.0.layout(view_state, cx) } - pub fn paint(&mut self, view_state: &mut V, cx: &mut ViewContext) { + pub fn paint(mut self, view_state: &mut V, cx: &mut ViewContext) { self.0.paint(view_state, cx) } @@ -289,7 +322,7 @@ impl AnyElement { /// Initializes this element and performs layout in the available space, then paints it at the given origin. pub fn draw( - &mut self, + mut self, origin: Point, available_space: Size, view_state: &mut V, @@ -343,7 +376,7 @@ where E: 'static + Component, F: FnOnce(&mut V, &mut ViewContext<'_, V>) -> E + 'static, { - type ElementState = AnyElement; + type State = Option>; fn element_id(&self) -> Option { None @@ -352,23 +385,23 @@ where fn layout( &mut self, view_state: &mut V, - _: Option, + _: Option, cx: &mut ViewContext, - ) -> (LayoutId, Self::ElementState) { + ) -> (LayoutId, Self::State) { let render = self.take().unwrap(); let mut rendered_element = (render)(view_state, cx).render(); let layout_id = rendered_element.layout(view_state, cx); - (layout_id, rendered_element) + (layout_id, Some(rendered_element)) } fn paint( - &mut self, + self, _bounds: Bounds, view_state: &mut V, - rendered_element: &mut Self::ElementState, + rendered_element: &mut Self::State, cx: &mut ViewContext, ) { - rendered_element.paint(view_state, cx) + rendered_element.take().unwrap().paint(view_state, cx); } } diff --git a/crates/gpui2/src/elements/div.rs b/crates/gpui2/src/elements/div.rs index f9560f2c53..1a70a9bab2 100644 --- a/crates/gpui2/src/elements/div.rs +++ b/crates/gpui2/src/elements/div.rs @@ -600,7 +600,7 @@ impl ParentComponent for Div { } impl Element for Div { - type ElementState = DivState; + type State = DivState; fn element_id(&self) -> Option { self.interactivity.element_id.clone() @@ -609,9 +609,9 @@ impl Element for Div { fn layout( &mut self, view_state: &mut V, - element_state: Option, + element_state: Option, cx: &mut ViewContext, - ) -> (LayoutId, Self::ElementState) { + ) -> (LayoutId, Self::State) { let mut child_layout_ids = SmallVec::new(); let mut interactivity = mem::take(&mut self.interactivity); let (layout_id, interactive_state) = interactivity.layout( @@ -639,10 +639,10 @@ impl Element for Div { } fn paint( - &mut self, + self, bounds: Bounds, view_state: &mut V, - element_state: &mut Self::ElementState, + element_state: &mut Self::State, cx: &mut ViewContext, ) { let mut child_min = point(Pixels::MAX, Pixels::MAX); @@ -658,8 +658,7 @@ impl Element for Div { (child_max - child_min).into() }; - let mut interactivity = mem::take(&mut self.interactivity); - interactivity.paint( + self.interactivity.paint( bounds, content_size, &mut element_state.interactive_state, @@ -679,7 +678,7 @@ impl Element for Div { cx.with_text_style(style.text_style().cloned(), |cx| { cx.with_content_mask(style.overflow_mask(bounds), |cx| { cx.with_element_offset(scroll_offset, |cx| { - for child in &mut self.children { + for child in self.children { child.paint(view_state, cx); } }) @@ -689,7 +688,6 @@ impl Element for Div { }) }, ); - self.interactivity = interactivity; } } @@ -770,7 +768,7 @@ where } pub fn paint( - &mut self, + mut self, bounds: Bounds, content_size: Size, element_state: &mut InteractiveElementState, @@ -786,25 +784,25 @@ where } } - for listener in self.mouse_down_listeners.drain(..) { + for listener in self.mouse_down_listeners { cx.on_mouse_event(move |state, event: &MouseDownEvent, phase, cx| { listener(state, event, &bounds, phase, cx); }) } - for listener in self.mouse_up_listeners.drain(..) { + for listener in self.mouse_up_listeners { cx.on_mouse_event(move |state, event: &MouseUpEvent, phase, cx| { listener(state, event, &bounds, phase, cx); }) } - for listener in self.mouse_move_listeners.drain(..) { + for listener in self.mouse_move_listeners { cx.on_mouse_event(move |state, event: &MouseMoveEvent, phase, cx| { listener(state, event, &bounds, phase, cx); }) } - for listener in self.scroll_wheel_listeners.drain(..) { + for listener in self.scroll_wheel_listeners { cx.on_mouse_event(move |state, event: &ScrollWheelEvent, phase, cx| { listener(state, event, &bounds, phase, cx); }) @@ -840,7 +838,7 @@ where } if cx.active_drag.is_some() { - let drop_listeners = mem::take(&mut self.drop_listeners); + let drop_listeners = self.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) = @@ -1062,24 +1060,24 @@ where self.key_context.clone(), element_state.focus_handle.clone(), |_, cx| { - for listener in self.key_down_listeners.drain(..) { + for listener in self.key_down_listeners { cx.on_key_event(move |state, event: &KeyDownEvent, phase, cx| { listener(state, event, phase, cx); }) } - for listener in self.key_up_listeners.drain(..) { + for listener in self.key_up_listeners { cx.on_key_event(move |state, event: &KeyUpEvent, phase, cx| { listener(state, event, phase, cx); }) } - for (action_type, listener) in self.action_listeners.drain(..) { + for (action_type, listener) in self.action_listeners { cx.on_action(action_type, listener) } if let Some(focus_handle) = element_state.focus_handle.as_ref() { - for listener in self.focus_listeners.drain(..) { + for listener in self.focus_listeners { let focus_handle = focus_handle.clone(); cx.on_focus_changed(move |view, event, cx| { listener(view, &focus_handle, event, cx) @@ -1291,7 +1289,7 @@ where V: 'static, E: Element, { - type ElementState = E::ElementState; + type State = E::State; fn element_id(&self) -> Option { self.element.element_id() @@ -1300,20 +1298,20 @@ where fn layout( &mut self, view_state: &mut V, - element_state: Option, + element_state: Option, cx: &mut ViewContext, - ) -> (LayoutId, Self::ElementState) { + ) -> (LayoutId, Self::State) { self.element.layout(view_state, element_state, cx) } fn paint( - &mut self, + self, bounds: Bounds, view_state: &mut V, - element_state: &mut Self::ElementState, + element_state: &mut Self::State, cx: &mut ViewContext, ) { - self.element.paint(bounds, view_state, element_state, cx); + self.element.paint(bounds, view_state, element_state, cx) } } @@ -1377,7 +1375,7 @@ where V: 'static, E: Element, { - type ElementState = E::ElementState; + type State = E::State; fn element_id(&self) -> Option { self.element.element_id() @@ -1386,17 +1384,17 @@ where fn layout( &mut self, view_state: &mut V, - element_state: Option, + element_state: Option, cx: &mut ViewContext, - ) -> (LayoutId, Self::ElementState) { + ) -> (LayoutId, Self::State) { self.element.layout(view_state, element_state, cx) } fn paint( - &mut self, + self, bounds: Bounds, view_state: &mut V, - element_state: &mut Self::ElementState, + element_state: &mut Self::State, cx: &mut ViewContext, ) { self.element.paint(bounds, view_state, element_state, cx) diff --git a/crates/gpui2/src/elements/img.rs b/crates/gpui2/src/elements/img.rs index 1080135fe1..db55bd0dc6 100644 --- a/crates/gpui2/src/elements/img.rs +++ b/crates/gpui2/src/elements/img.rs @@ -42,7 +42,7 @@ impl Component for Img { } impl Element for Img { - type ElementState = InteractiveElementState; + type State = InteractiveElementState; fn element_id(&self) -> Option { self.interactivity.element_id.clone() @@ -51,19 +51,19 @@ impl Element for Img { fn layout( &mut self, _view_state: &mut V, - element_state: Option, + element_state: Option, cx: &mut ViewContext, - ) -> (LayoutId, Self::ElementState) { + ) -> (LayoutId, Self::State) { self.interactivity.layout(element_state, cx, |style, cx| { cx.request_layout(&style, None) }) } fn paint( - &mut self, + self, bounds: Bounds, _view_state: &mut V, - element_state: &mut Self::ElementState, + element_state: &mut Self::State, cx: &mut ViewContext, ) { self.interactivity.paint( diff --git a/crates/gpui2/src/elements/overlay.rs b/crates/gpui2/src/elements/overlay.rs index 14a8048d39..394030f3d7 100644 --- a/crates/gpui2/src/elements/overlay.rs +++ b/crates/gpui2/src/elements/overlay.rs @@ -64,7 +64,7 @@ impl Component for Overlay { } impl Element for Overlay { - type ElementState = OverlayState; + type State = OverlayState; fn element_id(&self) -> Option { None @@ -73,9 +73,9 @@ impl Element for Overlay { fn layout( &mut self, view_state: &mut V, - _: Option, + _: Option, cx: &mut crate::ViewContext, - ) -> (crate::LayoutId, Self::ElementState) { + ) -> (crate::LayoutId, Self::State) { let child_layout_ids = self .children .iter_mut() @@ -92,10 +92,10 @@ impl Element for Overlay { } fn paint( - &mut self, + self, bounds: crate::Bounds, view_state: &mut V, - element_state: &mut Self::ElementState, + element_state: &mut Self::State, cx: &mut crate::ViewContext, ) { if element_state.child_layout_ids.is_empty() { @@ -156,7 +156,7 @@ impl Element for Overlay { } cx.with_element_offset(desired.origin - bounds.origin, |cx| { - for child in &mut self.children { + for child in self.children { child.paint(view_state, cx); } }) diff --git a/crates/gpui2/src/elements/svg.rs b/crates/gpui2/src/elements/svg.rs index c1c7691fbf..7d9c04b729 100644 --- a/crates/gpui2/src/elements/svg.rs +++ b/crates/gpui2/src/elements/svg.rs @@ -31,7 +31,7 @@ impl Component for Svg { } impl Element for Svg { - type ElementState = InteractiveElementState; + type State = InteractiveElementState; fn element_id(&self) -> Option { self.interactivity.element_id.clone() @@ -40,19 +40,19 @@ impl Element for Svg { fn layout( &mut self, _view_state: &mut V, - element_state: Option, + element_state: Option, cx: &mut ViewContext, - ) -> (LayoutId, Self::ElementState) { + ) -> (LayoutId, Self::State) { self.interactivity.layout(element_state, cx, |style, cx| { cx.request_layout(&style, None) }) } fn paint( - &mut self, + self, bounds: Bounds, _view_state: &mut V, - element_state: &mut Self::ElementState, + element_state: &mut Self::State, cx: &mut ViewContext, ) where Self: Sized, diff --git a/crates/gpui2/src/elements/text.rs b/crates/gpui2/src/elements/text.rs index 9e8256014e..c6090fdfb4 100644 --- a/crates/gpui2/src/elements/text.rs +++ b/crates/gpui2/src/elements/text.rs @@ -9,7 +9,7 @@ use std::{cell::Cell, rc::Rc, sync::Arc}; use util::ResultExt; impl Element for &'static str { - type ElementState = TextState; + type State = TextState; fn element_id(&self) -> Option { None @@ -18,16 +18,16 @@ impl Element for &'static str { fn layout( &mut self, _: &mut V, - _: Option, + _: Option, cx: &mut ViewContext, - ) -> (LayoutId, Self::ElementState) { + ) -> (LayoutId, Self::State) { let mut state = TextState::default(); let layout_id = state.layout(SharedString::from(*self), None, cx); (layout_id, state) } fn paint( - &mut self, + self, bounds: Bounds, _: &mut V, state: &mut TextState, @@ -38,7 +38,7 @@ impl Element for &'static str { } impl Element for SharedString { - type ElementState = TextState; + type State = TextState; fn element_id(&self) -> Option { Some(self.clone().into()) @@ -47,16 +47,16 @@ impl Element for SharedString { fn layout( &mut self, _: &mut V, - _: Option, + _: Option, cx: &mut ViewContext, - ) -> (LayoutId, Self::ElementState) { + ) -> (LayoutId, Self::State) { let mut state = TextState::default(); let layout_id = state.layout(self.clone(), None, cx); (layout_id, state) } fn paint( - &mut self, + self, bounds: Bounds, _: &mut V, state: &mut TextState, @@ -93,7 +93,7 @@ impl Component for Text { } impl Element for Text { - type ElementState = TextState; + type State = TextState; fn element_id(&self) -> Option { None @@ -102,9 +102,9 @@ impl Element for Text { fn layout( &mut self, _view: &mut V, - element_state: Option, + element_state: Option, cx: &mut ViewContext, - ) -> (LayoutId, Self::ElementState) { + ) -> (LayoutId, Self::State) { let element_state = element_state.unwrap_or_default(); let text_system = cx.text_system().clone(); let text_style = cx.text_style(); @@ -160,10 +160,10 @@ impl Element for Text { } fn paint( - &mut self, + self, bounds: Bounds, _: &mut V, - element_state: &mut Self::ElementState, + element_state: &mut Self::State, cx: &mut ViewContext, ) { let element_state = element_state.lock(); @@ -280,7 +280,7 @@ struct InteractiveTextState { } impl Element for InteractiveText { - type ElementState = InteractiveTextState; + type State = InteractiveTextState; fn element_id(&self) -> Option { Some(self.id.clone()) @@ -289,9 +289,9 @@ impl Element for InteractiveText { fn layout( &mut self, view_state: &mut V, - element_state: Option, + element_state: Option, cx: &mut ViewContext, - ) -> (LayoutId, Self::ElementState) { + ) -> (LayoutId, Self::State) { if let Some(InteractiveTextState { text_state, clicked_range_ixs, @@ -314,10 +314,10 @@ impl Element for InteractiveText { } fn paint( - &mut self, + self, bounds: Bounds, view_state: &mut V, - element_state: &mut Self::ElementState, + element_state: &mut Self::State, cx: &mut ViewContext, ) { self.text diff --git a/crates/gpui2/src/elements/uniform_list.rs b/crates/gpui2/src/elements/uniform_list.rs index 773f9ec8aa..d7339d00ab 100644 --- a/crates/gpui2/src/elements/uniform_list.rs +++ b/crates/gpui2/src/elements/uniform_list.rs @@ -4,7 +4,7 @@ use crate::{ Point, Size, StyleRefinement, Styled, ViewContext, }; use smallvec::SmallVec; -use std::{cell::RefCell, cmp, mem, ops::Range, rc::Rc}; +use std::{cell::RefCell, cmp, ops::Range, rc::Rc}; use taffy::style::Overflow; /// uniform_list provides lazy rendering for a set of items that are of uniform height. @@ -102,7 +102,7 @@ pub struct UniformListState { } impl Element for UniformList { - type ElementState = UniformListState; + type State = UniformListState; fn element_id(&self) -> Option { Some(self.id.clone()) @@ -111,9 +111,9 @@ impl Element for UniformList { fn layout( &mut self, view_state: &mut V, - element_state: Option, + element_state: Option, cx: &mut ViewContext, - ) -> (LayoutId, Self::ElementState) { + ) -> (LayoutId, Self::State) { let max_items = self.item_count; let rem_size = cx.rem_size(); let item_size = element_state @@ -159,10 +159,10 @@ impl Element for UniformList { } fn paint( - &mut self, + self, bounds: Bounds, view_state: &mut V, - element_state: &mut Self::ElementState, + element_state: &mut Self::State, cx: &mut ViewContext, ) { let style = @@ -183,14 +183,17 @@ impl Element for UniformList { height: item_size.height * self.item_count, }; - let mut interactivity = mem::take(&mut self.interactivity); let shared_scroll_offset = element_state .interactive .scroll_offset .get_or_insert_with(Rc::default) .clone(); - interactivity.paint( + let item_height = self + .measure_item(view_state, Some(padded_bounds.size.width), cx) + .height; + + self.interactivity.paint( bounds, content_size, &mut element_state.interactive, @@ -209,9 +212,6 @@ impl Element for UniformList { 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.borrow_mut().replace(ScrollHandleState { item_height, @@ -233,9 +233,9 @@ impl Element for UniformList { self.item_count, ); - let mut items = (self.render_items)(view_state, visible_range.clone(), cx); + let 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) { + for (item, ix) in items.into_iter().zip(visible_range) { let item_origin = padded_bounds.origin + point(px(0.), item_height * ix + scroll_offset.y); let available_space = size( @@ -249,7 +249,6 @@ impl Element for UniformList { }) }, ); - self.interactivity = interactivity; } } diff --git a/crates/gpui2/src/gpui2.rs b/crates/gpui2/src/gpui2.rs index 88ecd52c03..4423986e3d 100644 --- a/crates/gpui2/src/gpui2.rs +++ b/crates/gpui2/src/gpui2.rs @@ -78,8 +78,6 @@ use std::{ }; use taffy::TaffyLayoutEngine; -type AnyBox = Box; - pub trait Context { type Result; diff --git a/crates/gpui2/src/view.rs b/crates/gpui2/src/view.rs index 6b8c8a3eef..51675e814c 100644 --- a/crates/gpui2/src/view.rs +++ b/crates/gpui2/src/view.rs @@ -1,8 +1,7 @@ use crate::{ - private::Sealed, AnyBox, AnyElement, AnyModel, AnyWeakModel, AppContext, AvailableSpace, - BorrowWindow, Bounds, Component, Element, ElementId, Entity, EntityId, Flatten, FocusHandle, - FocusableView, LayoutId, Model, Pixels, Point, Size, ViewContext, VisualContext, WeakModel, - WindowContext, + private::Sealed, AnyElement, AnyModel, AnyWeakModel, AppContext, AvailableSpace, BorrowWindow, + Bounds, Component, Element, ElementId, Entity, EntityId, Flatten, FocusHandle, FocusableView, + LayoutId, Model, Pixels, Point, Size, ViewContext, VisualContext, WeakModel, WindowContext, }; use anyhow::{Context, Result}; use std::{ @@ -164,7 +163,7 @@ impl Eq for WeakView {} pub struct AnyView { model: AnyModel, layout: fn(&AnyView, &mut WindowContext) -> (LayoutId, Box), - paint: fn(&AnyView, &mut AnyBox, &mut WindowContext), + paint: fn(&AnyView, Box, &mut WindowContext), } impl AnyView { @@ -198,11 +197,11 @@ impl AnyView { cx: &mut WindowContext, ) { cx.with_absolute_element_offset(origin, |cx| { - let (layout_id, mut rendered_element) = (self.layout)(self, cx); + let (layout_id, rendered_element) = (self.layout)(self, cx); cx.window .layout_engine .compute_layout(layout_id, available_space); - (self.paint)(self, &mut rendered_element, cx); + (self.paint)(self, rendered_element, cx); }) } } @@ -224,7 +223,7 @@ impl From> for AnyView { } impl Element for AnyView { - type ElementState = Box; + type State = Option>; fn element_id(&self) -> Option { Some(self.model.entity_id.into()) @@ -233,27 +232,28 @@ impl Element for AnyView { fn layout( &mut self, _view_state: &mut ParentViewState, - _element_state: Option, + _element_state: Option, cx: &mut ViewContext, - ) -> (LayoutId, Self::ElementState) { - (self.layout)(self, cx) + ) -> (LayoutId, Self::State) { + let (layout_id, rendered_element) = (self.layout)(self, cx); + (layout_id, Some(rendered_element)) } fn paint( - &mut self, + mut self, _bounds: Bounds, _view_state: &mut ParentViewState, - rendered_element: &mut Self::ElementState, + rendered_element: &mut Self::State, cx: &mut ViewContext, ) { - (self.paint)(self, rendered_element, cx) + (self.paint)(&mut self, rendered_element.take().unwrap(), cx) } } pub struct AnyWeakView { model: AnyWeakModel, layout: fn(&AnyView, &mut WindowContext) -> (LayoutId, Box), - paint: fn(&AnyView, &mut AnyBox, &mut WindowContext), + paint: fn(&AnyView, Box, &mut WindowContext), } impl AnyWeakView { @@ -311,7 +311,7 @@ where ParentViewState: 'static, ViewState: 'static, { - type ElementState = AnyElement; + type State = Option>; fn element_id(&self) -> Option { Some(self.view.entity_id().into()) @@ -320,24 +320,25 @@ where fn layout( &mut self, _: &mut ParentViewState, - _: Option, + _: Option, cx: &mut ViewContext, - ) -> (LayoutId, Self::ElementState) { + ) -> (LayoutId, Self::State) { self.view.update(cx, |view, cx| { let mut element = self.component.take().unwrap().render(); let layout_id = element.layout(view, cx); - (layout_id, element) + (layout_id, Some(element)) }) } fn paint( - &mut self, + self, _: Bounds, _: &mut ParentViewState, - element: &mut Self::ElementState, + element: &mut Self::State, cx: &mut ViewContext, ) { - self.view.update(cx, |view, cx| element.paint(view, cx)) + self.view + .update(cx, |view, cx| element.take().unwrap().paint(view, cx)) } } @@ -359,14 +360,10 @@ mod any_view { }) } - pub(crate) fn paint( - view: &AnyView, - element: &mut Box, - cx: &mut WindowContext, - ) { + pub(crate) fn paint(view: &AnyView, element: Box, cx: &mut WindowContext) { cx.with_element_id(Some(view.model.entity_id), |cx| { let view = view.clone().downcast::().unwrap(); - let element = element.downcast_mut::>().unwrap(); + let element = element.downcast::>().unwrap(); view.update(cx, |view, cx| element.paint(view, cx)) }) } diff --git a/crates/gpui2/src/window.rs b/crates/gpui2/src/window.rs index 6d07f06d94..a9a2c60acb 100644 --- a/crates/gpui2/src/window.rs +++ b/crates/gpui2/src/window.rs @@ -1,5 +1,5 @@ use crate::{ - key_dispatch::DispatchActionListener, px, size, Action, AnyBox, AnyDrag, AnyView, AppContext, + key_dispatch::DispatchActionListener, px, size, Action, AnyDrag, AnyView, AppContext, AsyncWindowContext, AvailableSpace, Bounds, BoxShadow, Context, Corners, CursorStyle, DevicePixels, DispatchNodeId, DispatchTree, DisplayId, Edges, Effect, Entity, EntityId, EventEmitter, FileDropEvent, FocusEvent, FontId, GlobalElementId, GlyphId, Hsla, ImageData, @@ -237,7 +237,7 @@ pub struct Window { // #[derive(Default)] pub(crate) struct Frame { - pub(crate) element_states: HashMap, + pub(crate) element_states: HashMap>, mouse_listeners: HashMap>, pub(crate) dispatch_tree: DispatchTree, pub(crate) focus_listeners: Vec, diff --git a/crates/gpui2_macros/src/gpui2_macros.rs b/crates/gpui2_macros/src/gpui2_macros.rs index 3ce8373689..02c9629d01 100644 --- a/crates/gpui2_macros/src/gpui2_macros.rs +++ b/crates/gpui2_macros/src/gpui2_macros.rs @@ -1,5 +1,6 @@ mod action; mod derive_component; +mod derive_element; mod register_action; mod style_helpers; mod test; @@ -26,6 +27,11 @@ pub fn derive_component(input: TokenStream) -> TokenStream { derive_component::derive_component(input) } +// #[proc_macro_derive(Element)] +// pub fn derive_element(input: TokenStream) -> TokenStream { +// derive_element::derive_element(input) +// } + #[proc_macro_attribute] pub fn test(args: TokenStream, function: TokenStream) -> TokenStream { test::test(args, function) diff --git a/crates/ui2/src/components/context_menu.rs b/crates/ui2/src/components/context_menu.rs index d3214cbff1..c6d2382f56 100644 --- a/crates/ui2/src/components/context_menu.rs +++ b/crates/ui2/src/components/context_menu.rs @@ -133,7 +133,7 @@ pub struct MenuHandleState { menu_element: Option>, } impl Element for MenuHandle { - type ElementState = MenuHandleState; + type State = MenuHandleState; fn element_id(&self) -> Option { Some(self.id.clone().expect("menu_handle must have an id()")) @@ -142,9 +142,9 @@ impl Element for MenuHandle { fn layout( &mut self, view_state: &mut V, - element_state: Option, + element_state: Option, cx: &mut crate::ViewContext, - ) -> (gpui::LayoutId, Self::ElementState) { + ) -> (gpui::LayoutId, Self::State) { let (menu, position) = if let Some(element_state) = element_state { (element_state.menu, element_state.position) } else { @@ -192,22 +192,22 @@ impl Element for MenuHandle { } fn paint( - &mut self, + self, bounds: Bounds, view_state: &mut V, - element_state: &mut Self::ElementState, + element_state: &mut Self::State, cx: &mut crate::ViewContext, ) { - if let Some(child) = element_state.child_element.as_mut() { + if let Some(child) = element_state.child_element.take() { child.paint(view_state, cx); } - if let Some(menu) = element_state.menu_element.as_mut() { + if let Some(menu) = element_state.menu_element.take() { menu.paint(view_state, cx); return; } - let Some(builder) = self.menu_builder.clone() else { + let Some(builder) = self.menu_builder else { return; }; let menu = element_state.menu.clone(); From 23ffce9fbe382931b13f740468541baa9eb88b84 Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Sat, 18 Nov 2023 00:03:23 -0700 Subject: [PATCH 05/20] WIP: Work toward eliminating Component trait This refactor enhances the overall design by promoting reusable and composable UI component structures within the Zed project codebase. --- crates/gpui2/src/element.rs | 83 ++++++++++++++++++- crates/gpui2/src/interactive.rs | 7 +- crates/storybook2/src/stories/z_index.rs | 2 +- crates/theme2/src/story.rs | 17 ++-- crates/ui2/docs/hello-world.md | 10 +-- crates/ui2/src/components/avatar.rs | 2 +- crates/ui2/src/components/button.rs | 4 +- crates/ui2/src/components/checkbox.rs | 4 +- crates/ui2/src/components/details.rs | 2 +- crates/ui2/src/components/divider.rs | 2 +- crates/ui2/src/components/facepile.rs | 2 +- crates/ui2/src/components/icon.rs | 2 +- crates/ui2/src/components/icon_button.rs | 2 +- crates/ui2/src/components/indicator.rs | 2 +- crates/ui2/src/components/input.rs | 2 +- crates/ui2/src/components/keybinding.rs | 4 +- crates/ui2/src/components/label.rs | 4 +- crates/ui2/src/components/list.rs | 12 +-- crates/ui2/src/components/modal.rs | 2 +- .../ui2/src/components/notification_toast.rs | 2 +- crates/ui2/src/components/palette.rs | 4 +- crates/ui2/src/components/panel.rs | 2 +- crates/ui2/src/components/player_stack.rs | 2 +- crates/ui2/src/components/tab.rs | 2 +- crates/ui2/src/components/toast.rs | 33 +++++++- crates/ui2/src/components/toggle.rs | 4 +- crates/ui2/src/components/tool_divider.rs | 2 +- crates/ui2/src/story.rs | 6 +- crates/ui2/src/to_extract/assistant_panel.rs | 2 +- crates/ui2/src/to_extract/breadcrumb.rs | 2 +- crates/ui2/src/to_extract/buffer.rs | 6 +- crates/ui2/src/to_extract/chat_panel.rs | 4 +- crates/ui2/src/to_extract/collab_panel.rs | 2 +- crates/ui2/src/to_extract/command_palette.rs | 2 +- crates/ui2/src/to_extract/copilot.rs | 2 +- .../ui2/src/to_extract/language_selector.rs | 2 +- crates/ui2/src/to_extract/multi_buffer.rs | 2 +- .../ui2/src/to_extract/notifications_panel.rs | 8 +- crates/ui2/src/to_extract/panes.rs | 4 +- crates/ui2/src/to_extract/project_panel.rs | 2 +- crates/ui2/src/to_extract/recent_projects.rs | 2 +- crates/ui2/src/to_extract/tab_bar.rs | 2 +- crates/ui2/src/to_extract/terminal.rs | 2 +- crates/ui2/src/to_extract/theme_selector.rs | 2 +- crates/ui2/src/to_extract/toolbar.rs | 10 +-- crates/ui2/src/to_extract/traffic_lights.rs | 4 +- 46 files changed, 192 insertions(+), 90 deletions(-) diff --git a/crates/gpui2/src/element.rs b/crates/gpui2/src/element.rs index b9d312755a..5220892885 100644 --- a/crates/gpui2/src/element.rs +++ b/crates/gpui2/src/element.rs @@ -65,25 +65,26 @@ pub struct GlobalElementId(SmallVec<[ElementId; 32]>); pub trait ParentComponent { fn children_mut(&mut self) -> &mut SmallVec<[AnyElement; 2]>; - fn child(mut self, child: impl Component) -> Self + fn child(mut self, child: impl Element) -> Self where Self: Sized, { - self.children_mut().push(child.render()); + self.children_mut().push(child.into_any()); self } - fn children(mut self, iter: impl IntoIterator>) -> Self + fn children(mut self, children: impl IntoIterator>) -> Self where Self: Sized, { self.children_mut() - .extend(iter.into_iter().map(|item| item.render())); + .extend(children.into_iter().map(Element::into_any)); self } } trait ElementObject { + fn element_id(&self) -> Option; fn layout(&mut self, view_state: &mut V, cx: &mut ViewContext) -> LayoutId; fn paint(&mut self, view_state: &mut V, cx: &mut ViewContext); fn measure( @@ -132,6 +133,10 @@ impl> DrawableElement { } } + fn element_id(&self) -> Option { + self.element.as_ref()?.element_id() + } + fn layout(&mut self, state: &mut V, cx: &mut ViewContext) -> LayoutId { let (layout_id, frame_state) = if let Some(id) = self.element.as_ref().unwrap().element_id() { @@ -256,6 +261,10 @@ where E: Element, E::State: 'static, { + fn element_id(&self) -> Option { + self.as_ref().unwrap().element_id() + } + fn layout(&mut self, view_state: &mut V, cx: &mut ViewContext) -> LayoutId { DrawableElement::layout(self.as_mut().unwrap(), view_state, cx) } @@ -302,6 +311,10 @@ impl AnyElement { AnyElement(Box::new(Some(DrawableElement::new(element))) as Box>) } + pub fn element_id(&self) -> Option { + self.0.element_id() + } + pub fn layout(&mut self, view_state: &mut V, cx: &mut ViewContext) -> LayoutId { self.0.layout(view_state, cx) } @@ -332,6 +345,34 @@ impl AnyElement { } } +impl Element for AnyElement { + type State = (); + + fn element_id(&self) -> Option { + AnyElement::element_id(self) + } + + fn layout( + &mut self, + view_state: &mut V, + _: Option, + cx: &mut ViewContext, + ) -> (LayoutId, Self::State) { + let layout_id = self.layout(view_state, cx); + (layout_id, ()) + } + + fn paint( + self, + bounds: Bounds, + view_state: &mut V, + _: &mut Self::State, + cx: &mut ViewContext, + ) { + self.paint(view_state, cx); + } +} + pub trait Component { fn render(self) -> AnyElement; @@ -426,3 +467,37 @@ where AnyElement::new(Some(self)) } } + +// impl Element for F +// where +// V: 'static, +// E: 'static + Component, +// F: FnOnce(&mut V, &mut ViewContext<'_, V>) -> E + 'static, +// { +// type State = Option>; + +// fn element_id(&self) -> Option { +// None +// } + +// fn layout( +// &mut self, +// view_state: &mut V, +// element_state: Option, +// cx: &mut ViewContext, +// ) -> (LayoutId, Self::State) { + +// self(view_state) + +// } + +// fn paint( +// self, +// bounds: Bounds, +// view_state: &mut V, +// element_state: &mut Self::State, +// cx: &mut ViewContext, +// ) { +// todo!() +// } +// } diff --git a/crates/gpui2/src/interactive.rs b/crates/gpui2/src/interactive.rs index 80a89ef625..83bcc5c8c5 100644 --- a/crates/gpui2/src/interactive.rs +++ b/crates/gpui2/src/interactive.rs @@ -307,12 +307,7 @@ mod test { .key_context("parent") .on_key_down(|this: &mut TestView, _, _, _| this.saw_key_down = true) .on_action(|this: &mut TestView, _: &TestAction, _| this.saw_action = true) - .child(|this: &mut Self, _cx: &mut ViewContext| { - div() - .key_context("nested") - .track_focus(&this.focus_handle) - .render() - }), + .child(div().key_context("nested").track_focus(&self.focus_handle)), ) } } diff --git a/crates/storybook2/src/stories/z_index.rs b/crates/storybook2/src/stories/z_index.rs index 46ec0f4a35..02165db0cd 100644 --- a/crates/storybook2/src/stories/z_index.rs +++ b/crates/storybook2/src/stories/z_index.rs @@ -89,7 +89,7 @@ impl ZIndexExample { Self { z_index } } - fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Component { + fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Element { div() .relative() .size_full() diff --git a/crates/theme2/src/story.rs b/crates/theme2/src/story.rs index 4296d4f99c..9cf78cf943 100644 --- a/crates/theme2/src/story.rs +++ b/crates/theme2/src/story.rs @@ -1,4 +1,4 @@ -use gpui::{div, Component, Div, ParentComponent, Styled, ViewContext}; +use gpui::{div, Component, Div, Element, ParentComponent, SharedString, Styled, ViewContext}; use crate::ActiveTheme; @@ -16,23 +16,26 @@ impl Story { .bg(cx.theme().colors().background) } - pub fn title(cx: &mut ViewContext, title: &str) -> impl Component { + pub fn title(cx: &mut ViewContext, title: SharedString) -> impl Element { div() .text_xl() .text_color(cx.theme().colors().text) - .child(title.to_owned()) + .child(title) } - pub fn title_for(cx: &mut ViewContext) -> impl Component { - Self::title(cx, std::any::type_name::()) + pub fn title_for(cx: &mut ViewContext) -> impl Element { + Self::title(cx, std::any::type_name::().into()) } - pub fn label(cx: &mut ViewContext, label: &str) -> impl Component { + pub fn label( + cx: &mut ViewContext, + label: impl Into, + ) -> impl Element { div() .mt_4() .mb_2() .text_xs() .text_color(cx.theme().colors().text) - .child(label.to_owned()) + .child(label.into()) } } diff --git a/crates/ui2/docs/hello-world.md b/crates/ui2/docs/hello-world.md index e8ed3bb944..f48dd460b8 100644 --- a/crates/ui2/docs/hello-world.md +++ b/crates/ui2/docs/hello-world.md @@ -49,13 +49,13 @@ use gpui::hsla impl TodoList { // ... - fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Component { + fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Element { div().size_4().bg(hsla(50.0/360.0, 1.0, 0.5, 1.0)) } } ~~~ -Every component needs a render method, and it should return `impl Component`. This basic component will render a 16x16px yellow square on the screen. +Every component needs a render method, and it should return `impl Element`. This basic component will render a 16x16px yellow square on the screen. A couple of questions might come to mind: @@ -87,7 +87,7 @@ We can access the current theme's colors like this: ~~~rust impl TodoList { // ... - fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Component { + fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Element { let color = cx.theme().colors() div().size_4().hsla(50.0/360.0, 1.0, 0.5, 1.0) @@ -102,7 +102,7 @@ use gpui::hsla impl TodoList { // ... - fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Component { + fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Element { let color = cx.theme().colors() div().size_4().bg(color.surface) @@ -117,7 +117,7 @@ use gpui::hsla impl TodoList { // ... - fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Component { + fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Element { let color = cx.theme().colors() div() diff --git a/crates/ui2/src/components/avatar.rs b/crates/ui2/src/components/avatar.rs index d083d8fd46..5ab00b33ed 100644 --- a/crates/ui2/src/components/avatar.rs +++ b/crates/ui2/src/components/avatar.rs @@ -21,7 +21,7 @@ impl Avatar { self } - fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Component { + fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Element { let mut img = img(); if self.shape == Shape::Circle { diff --git a/crates/ui2/src/components/button.rs b/crates/ui2/src/components/button.rs index de055bcd5c..b2c6893793 100644 --- a/crates/ui2/src/components/button.rs +++ b/crates/ui2/src/components/button.rs @@ -164,7 +164,7 @@ impl Button { self.icon.map(|i| IconElement::new(i).color(icon_color)) } - pub fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Component { + pub fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Element { let (icon_color, label_color) = match (self.disabled, self.color) { (true, _) => (TextColor::Disabled, TextColor::Disabled), (_, None) => (TextColor::Default, TextColor::Default), @@ -222,7 +222,7 @@ impl ButtonGroup { Self { buttons } } - fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Component { + fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Element { let mut el = h_stack().text_ui(); for button in self.buttons { diff --git a/crates/ui2/src/components/checkbox.rs b/crates/ui2/src/components/checkbox.rs index 5b9db17785..0b3141a9f3 100644 --- a/crates/ui2/src/components/checkbox.rs +++ b/crates/ui2/src/components/checkbox.rs @@ -1,4 +1,4 @@ -use gpui::{div, prelude::*, Component, ElementId, Styled, ViewContext}; +use gpui::{div, prelude::*, Component, Element, ElementId, Styled, ViewContext}; use std::sync::Arc; use theme2::ActiveTheme; @@ -42,7 +42,7 @@ impl Checkbox { self } - pub fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Component { + pub fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Element { let group_id = format!("checkbox_group_{:?}", self.id); let icon = match self.checked { diff --git a/crates/ui2/src/components/details.rs b/crates/ui2/src/components/details.rs index f138290f17..41b3e45a95 100644 --- a/crates/ui2/src/components/details.rs +++ b/crates/ui2/src/components/details.rs @@ -27,7 +27,7 @@ impl Details { self } - fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Component { + fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Element { v_stack() .p_1() .gap_0p5() diff --git a/crates/ui2/src/components/divider.rs b/crates/ui2/src/components/divider.rs index 5ebfc7a4ff..7025a99a9f 100644 --- a/crates/ui2/src/components/divider.rs +++ b/crates/ui2/src/components/divider.rs @@ -31,7 +31,7 @@ impl Divider { self } - fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Component { + fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Element { div() .map(|this| match self.direction { DividerDirection::Horizontal => { diff --git a/crates/ui2/src/components/facepile.rs b/crates/ui2/src/components/facepile.rs index efac4925f8..a3ec7db7b1 100644 --- a/crates/ui2/src/components/facepile.rs +++ b/crates/ui2/src/components/facepile.rs @@ -13,7 +13,7 @@ impl Facepile { } } - fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Component { + fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Element { let player_count = self.players.len(); let player_list = self.players.iter().enumerate().map(|(ix, player)| { let isnt_last = ix < player_count - 1; diff --git a/crates/ui2/src/components/icon.rs b/crates/ui2/src/components/icon.rs index 61aa234978..7dc9385a4f 100644 --- a/crates/ui2/src/components/icon.rs +++ b/crates/ui2/src/components/icon.rs @@ -163,7 +163,7 @@ impl IconElement { self } - fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Component { + fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Element { let svg_size = match self.size { IconSize::Small => rems(0.75), IconSize::Medium => rems(0.9375), diff --git a/crates/ui2/src/components/icon_button.rs b/crates/ui2/src/components/icon_button.rs index 9b8548e3f9..5bb26cdb91 100644 --- a/crates/ui2/src/components/icon_button.rs +++ b/crates/ui2/src/components/icon_button.rs @@ -80,7 +80,7 @@ impl IconButton { self.on_click(move |this, cx| cx.dispatch_action(action.boxed_clone())) } - fn render(mut self, _view: &mut V, cx: &mut ViewContext) -> impl Component { + fn render(mut self, _view: &mut V, cx: &mut ViewContext) -> impl Element { let icon_color = match (self.state, self.color) { (InteractionState::Disabled, _) => TextColor::Disabled, (InteractionState::Active, _) => TextColor::Selected, diff --git a/crates/ui2/src/components/indicator.rs b/crates/ui2/src/components/indicator.rs index 83030ebbee..02760852b1 100644 --- a/crates/ui2/src/components/indicator.rs +++ b/crates/ui2/src/components/indicator.rs @@ -10,7 +10,7 @@ impl UnreadIndicator { Self } - fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Component { + fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Element { div() .rounded_full() .border_2() diff --git a/crates/ui2/src/components/input.rs b/crates/ui2/src/components/input.rs index 42de03db12..1389d83ce2 100644 --- a/crates/ui2/src/components/input.rs +++ b/crates/ui2/src/components/input.rs @@ -55,7 +55,7 @@ impl Input { self } - fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Component { + fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Element { let (input_bg, input_hover_bg, input_active_bg) = match self.variant { InputVariant::Ghost => ( cx.theme().colors().ghost_element_background, diff --git a/crates/ui2/src/components/keybinding.rs b/crates/ui2/src/components/keybinding.rs index 8da5273bf5..608e3ab0b8 100644 --- a/crates/ui2/src/components/keybinding.rs +++ b/crates/ui2/src/components/keybinding.rs @@ -24,7 +24,7 @@ impl KeyBinding { Self { key_binding } } - fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Component { + fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Element { div() .flex() .gap_2() @@ -52,7 +52,7 @@ impl Key { Self { key: key.into() } } - fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Component { + fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Element { div() .px_2() .py_0() diff --git a/crates/ui2/src/components/label.rs b/crates/ui2/src/components/label.rs index 1beee5c8b7..c07c467000 100644 --- a/crates/ui2/src/components/label.rs +++ b/crates/ui2/src/components/label.rs @@ -100,7 +100,7 @@ impl Label { self } - fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Component { + fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Element { div() .when(self.strikethrough, |this| { this.relative().child( @@ -161,7 +161,7 @@ impl HighlightedLabel { self } - fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Component { + fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Element { let highlight_color = cx.theme().colors().text_accent; let mut text_style = cx.text_style().clone(); diff --git a/crates/ui2/src/components/list.rs b/crates/ui2/src/components/list.rs index b9508c5413..8756d2934c 100644 --- a/crates/ui2/src/components/list.rs +++ b/crates/ui2/src/components/list.rs @@ -57,7 +57,7 @@ impl ListHeader { self } - fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Component { + fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Element { let disclosure_control = disclosure_control(self.toggle); let meta = match self.meta { @@ -138,7 +138,7 @@ impl ListSubHeader { self } - fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Component { + fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Element { h_stack().flex_1().w_full().relative().py_1().child( div() .h_6() @@ -198,7 +198,7 @@ impl From for ListItem { } impl ListItem { - fn render(self, view: &mut V, cx: &mut ViewContext) -> impl Component { + fn render(self, view: &mut V, cx: &mut ViewContext) -> impl Element { match self { ListItem::Entry(entry) => div().child(entry.render(view, cx)), ListItem::Separator(separator) => div().child(separator.render(view, cx)), @@ -307,7 +307,7 @@ impl ListEntry { self } - fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Component { + fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Element { let settings = user_settings(cx); let left_content = match self.left_slot.clone() { @@ -385,7 +385,7 @@ impl ListSeparator { Self } - fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Component { + fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Element { div().h_px().w_full().bg(cx.theme().colors().border_variant) } } @@ -425,7 +425,7 @@ impl List { self } - fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Component { + fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Element { let list_content = match (self.items.is_empty(), self.toggle) { (false, _) => div().children(self.items), (true, Toggle::Toggled(false)) => div(), diff --git a/crates/ui2/src/components/modal.rs b/crates/ui2/src/components/modal.rs index c3d71a78d8..ac4cb4017f 100644 --- a/crates/ui2/src/components/modal.rs +++ b/crates/ui2/src/components/modal.rs @@ -38,7 +38,7 @@ impl Modal { self } - fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Component { + fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Element { v_stack() .id(self.id.clone()) .w_96() diff --git a/crates/ui2/src/components/notification_toast.rs b/crates/ui2/src/components/notification_toast.rs index aeb2aa6ed9..ec0d2ac216 100644 --- a/crates/ui2/src/components/notification_toast.rs +++ b/crates/ui2/src/components/notification_toast.rs @@ -22,7 +22,7 @@ impl NotificationToast { self } - fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Component { + fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Element { h_stack() .z_index(5) .absolute() diff --git a/crates/ui2/src/components/palette.rs b/crates/ui2/src/components/palette.rs index 5adf794a5e..4b6daea0f9 100644 --- a/crates/ui2/src/components/palette.rs +++ b/crates/ui2/src/components/palette.rs @@ -42,7 +42,7 @@ impl Palette { self } - fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Component { + fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Element { v_stack() .id(self.id.clone()) .w_96() @@ -135,7 +135,7 @@ impl PaletteItem { self } - fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Component { + fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Element { div() .flex() .flex_row() diff --git a/crates/ui2/src/components/panel.rs b/crates/ui2/src/components/panel.rs index d9fc50dd92..88aca620da 100644 --- a/crates/ui2/src/components/panel.rs +++ b/crates/ui2/src/components/panel.rs @@ -92,7 +92,7 @@ impl Panel { self } - fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Component { + fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Element { let current_size = self.width.unwrap_or(self.initial_width); v_stack() diff --git a/crates/ui2/src/components/player_stack.rs b/crates/ui2/src/components/player_stack.rs index 1a1231e6c4..b883f76d35 100644 --- a/crates/ui2/src/components/player_stack.rs +++ b/crates/ui2/src/components/player_stack.rs @@ -13,7 +13,7 @@ impl PlayerStack { } } - fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Component { + fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Element { let player = self.player_with_call_status.get_player(); let followers = self diff --git a/crates/ui2/src/components/tab.rs b/crates/ui2/src/components/tab.rs index 820fe5b361..7238dbc337 100644 --- a/crates/ui2/src/components/tab.rs +++ b/crates/ui2/src/components/tab.rs @@ -86,7 +86,7 @@ impl Tab { self } - fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Component { + fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Element { let has_fs_conflict = self.fs_status == FileSystemStatus::Conflict; let is_deleted = self.fs_status == FileSystemStatus::Deleted; diff --git a/crates/ui2/src/components/toast.rs b/crates/ui2/src/components/toast.rs index 0fcfe6038b..08e850d2a2 100644 --- a/crates/ui2/src/components/toast.rs +++ b/crates/ui2/src/components/toast.rs @@ -21,12 +21,41 @@ pub enum ToastOrigin { /// they are actively showing the a process in progress. /// /// Only one toast may be visible at a time. -#[derive(Component)] pub struct Toast { origin: ToastOrigin, children: SmallVec<[AnyElement; 2]>, } +impl Element for Toast { + type State = Option>; + + fn element_id(&self) -> Option { + None + } + + fn layout( + &mut self, + view_state: &mut V, + _element_state: Option, + cx: &mut ViewContext, + ) -> (gpui::LayoutId, Self::State) { + let mut element = self.render(view_state, cx).into_any(); + let layout_id = element.layout(view_state, cx); + (layout_id, Some(element)) + } + + fn paint( + self, + bounds: gpui::Bounds, + view_state: &mut V, + element: &mut Self::State, + cx: &mut ViewContext, + ) { + let element = element.take().unwrap(); + element.paint(view_state, cx); + } +} + impl Toast { pub fn new(origin: ToastOrigin) -> Self { Self { @@ -35,7 +64,7 @@ impl Toast { } } - fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Component { + fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Element { let mut div = div(); if self.origin == ToastOrigin::Bottom { diff --git a/crates/ui2/src/components/toggle.rs b/crates/ui2/src/components/toggle.rs index 8388e27531..5919a19fc6 100644 --- a/crates/ui2/src/components/toggle.rs +++ b/crates/ui2/src/components/toggle.rs @@ -1,4 +1,4 @@ -use gpui::{div, Component, ParentComponent}; +use gpui::{div, Component, Element, ParentComponent}; use crate::{Icon, IconElement, IconSize, TextColor}; @@ -44,7 +44,7 @@ impl From for Toggle { } } -pub fn disclosure_control(toggle: Toggle) -> impl Component { +pub fn disclosure_control(toggle: Toggle) -> impl Element { match (toggle.is_toggleable(), toggle.is_toggled()) { (false, _) => div(), (_, true) => div().child( diff --git a/crates/ui2/src/components/tool_divider.rs b/crates/ui2/src/components/tool_divider.rs index 8a9bbad97f..ca443ccb7f 100644 --- a/crates/ui2/src/components/tool_divider.rs +++ b/crates/ui2/src/components/tool_divider.rs @@ -8,7 +8,7 @@ impl ToolDivider { Self } - fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Component { + fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Element { div().w_px().h_3().bg(cx.theme().colors().border) } } diff --git a/crates/ui2/src/story.rs b/crates/ui2/src/story.rs index c98cfa012f..b5fef606b7 100644 --- a/crates/ui2/src/story.rs +++ b/crates/ui2/src/story.rs @@ -15,18 +15,18 @@ impl Story { .bg(cx.theme().colors().background) } - pub fn title(cx: &mut ViewContext, title: &str) -> impl Component { + pub fn title(cx: &mut ViewContext, title: &str) -> impl Element { div() .text_xl() .text_color(cx.theme().colors().text) .child(title.to_owned()) } - pub fn title_for(cx: &mut ViewContext) -> impl Component { + pub fn title_for(cx: &mut ViewContext) -> impl Element { Self::title(cx, std::any::type_name::()) } - pub fn label(cx: &mut ViewContext, label: &str) -> impl Component { + pub fn label(cx: &mut ViewContext, label: &str) -> impl Element { div() .mt_4() .mb_2() diff --git a/crates/ui2/src/to_extract/assistant_panel.rs b/crates/ui2/src/to_extract/assistant_panel.rs index f111dad830..708d271b5b 100644 --- a/crates/ui2/src/to_extract/assistant_panel.rs +++ b/crates/ui2/src/to_extract/assistant_panel.rs @@ -21,7 +21,7 @@ impl AssistantPanel { self } - fn render(self, view: &mut V, cx: &mut ViewContext) -> impl Component { + fn render(self, view: &mut V, cx: &mut ViewContext) -> impl Element { Panel::new(self.id.clone(), cx) .children(vec![div() .flex() diff --git a/crates/ui2/src/to_extract/breadcrumb.rs b/crates/ui2/src/to_extract/breadcrumb.rs index fd43a5b3bf..6990890054 100644 --- a/crates/ui2/src/to_extract/breadcrumb.rs +++ b/crates/ui2/src/to_extract/breadcrumb.rs @@ -22,7 +22,7 @@ impl Breadcrumb { .text_color(cx.theme().colors().text_muted) } - fn render(self, view_state: &mut V, cx: &mut ViewContext) -> impl Component { + fn render(self, view_state: &mut V, cx: &mut ViewContext) -> impl Element { let symbols_len = self.symbols.len(); h_stack() diff --git a/crates/ui2/src/to_extract/buffer.rs b/crates/ui2/src/to_extract/buffer.rs index aa4bebc9d5..c8223daf2f 100644 --- a/crates/ui2/src/to_extract/buffer.rs +++ b/crates/ui2/src/to_extract/buffer.rs @@ -154,7 +154,7 @@ impl Buffer { self } - fn render_row(row: BufferRow, cx: &WindowContext) -> impl Component { + fn render_row(row: BufferRow, cx: &WindowContext) -> impl Element { let line_background = if row.current { cx.theme().colors().editor_active_line_background } else { @@ -202,7 +202,7 @@ impl Buffer { })) } - fn render_rows(&self, cx: &WindowContext) -> Vec> { + fn render_rows(&self, cx: &WindowContext) -> Vec> { match &self.rows { Some(rows) => rows .rows @@ -213,7 +213,7 @@ impl Buffer { } } - fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Component { + fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Element { let rows = self.render_rows(cx); v_stack() diff --git a/crates/ui2/src/to_extract/chat_panel.rs b/crates/ui2/src/to_extract/chat_panel.rs index 7e2846a3f6..528e40f903 100644 --- a/crates/ui2/src/to_extract/chat_panel.rs +++ b/crates/ui2/src/to_extract/chat_panel.rs @@ -21,7 +21,7 @@ impl ChatPanel { self } - fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Component { + fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Element { div() .id(self.element_id.clone()) .flex() @@ -83,7 +83,7 @@ impl ChatMessage { } } - fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Component { + fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Element { div() .flex() .flex_col() diff --git a/crates/ui2/src/to_extract/collab_panel.rs b/crates/ui2/src/to_extract/collab_panel.rs index 256a648c0d..55efbb5ec5 100644 --- a/crates/ui2/src/to_extract/collab_panel.rs +++ b/crates/ui2/src/to_extract/collab_panel.rs @@ -14,7 +14,7 @@ impl CollabPanel { Self { id: id.into() } } - fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Component { + fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Element { v_stack() .id(self.id.clone()) .h_full() diff --git a/crates/ui2/src/to_extract/command_palette.rs b/crates/ui2/src/to_extract/command_palette.rs index 8a9461c796..353e1daac8 100644 --- a/crates/ui2/src/to_extract/command_palette.rs +++ b/crates/ui2/src/to_extract/command_palette.rs @@ -11,7 +11,7 @@ impl CommandPalette { Self { id: id.into() } } - fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Component { + fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Element { div().id(self.id.clone()).child( Palette::new("palette") .items(example_editor_actions()) diff --git a/crates/ui2/src/to_extract/copilot.rs b/crates/ui2/src/to_extract/copilot.rs index c5622f5be6..b07c562c13 100644 --- a/crates/ui2/src/to_extract/copilot.rs +++ b/crates/ui2/src/to_extract/copilot.rs @@ -10,7 +10,7 @@ impl CopilotModal { Self { id: id.into() } } - fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Component { + fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Element { div().id(self.id.clone()).child( Modal::new("some-id") .title("Connect Copilot to Zed") diff --git a/crates/ui2/src/to_extract/language_selector.rs b/crates/ui2/src/to_extract/language_selector.rs index 694ca78e9c..e05145e8c8 100644 --- a/crates/ui2/src/to_extract/language_selector.rs +++ b/crates/ui2/src/to_extract/language_selector.rs @@ -11,7 +11,7 @@ impl LanguageSelector { Self { id: id.into() } } - fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Component { + fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Element { div().id(self.id.clone()).child( Palette::new("palette") .items(vec![ diff --git a/crates/ui2/src/to_extract/multi_buffer.rs b/crates/ui2/src/to_extract/multi_buffer.rs index 78a22d51d0..186303365b 100644 --- a/crates/ui2/src/to_extract/multi_buffer.rs +++ b/crates/ui2/src/to_extract/multi_buffer.rs @@ -11,7 +11,7 @@ impl MultiBuffer { Self { buffers } } - fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Component { + fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Element { v_stack() .w_full() .h_full() diff --git a/crates/ui2/src/to_extract/notifications_panel.rs b/crates/ui2/src/to_extract/notifications_panel.rs index f56194fc47..fa7f8c2bd5 100644 --- a/crates/ui2/src/to_extract/notifications_panel.rs +++ b/crates/ui2/src/to_extract/notifications_panel.rs @@ -15,7 +15,7 @@ impl NotificationsPanel { Self { id: id.into() } } - fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Component { + fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Element { div() .id(self.id.clone()) .flex() @@ -241,7 +241,7 @@ impl Notification { self } - fn render_meta_items(&self, cx: &mut ViewContext) -> impl Component { + fn render_meta_items(&self, cx: &mut ViewContext) -> impl Element { if let Some(meta) = &self.meta { h_stack().children( meta.items @@ -260,14 +260,14 @@ impl Notification { } } - fn render_slot(&self, cx: &mut ViewContext) -> impl Component { + fn render_slot(&self, cx: &mut ViewContext) -> impl Element { match &self.slot { ActorOrIcon::Actor(actor) => Avatar::new(actor.avatar.clone()).render(), ActorOrIcon::Icon(icon) => IconElement::new(icon.clone()).render(), } } - fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Component { + fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Element { div() .relative() .id(self.id.clone()) diff --git a/crates/ui2/src/to_extract/panes.rs b/crates/ui2/src/to_extract/panes.rs index 288419d8bf..3b75d55d77 100644 --- a/crates/ui2/src/to_extract/panes.rs +++ b/crates/ui2/src/to_extract/panes.rs @@ -35,7 +35,7 @@ impl Pane { self } - fn render(self, view: &mut V, cx: &mut ViewContext) -> impl Component { + fn render(self, view: &mut V, cx: &mut ViewContext) -> impl Element { div() .id(self.id.clone()) .flex() @@ -89,7 +89,7 @@ impl PaneGroup { } } - fn render(self, view: &mut V, cx: &mut ViewContext) -> impl Component { + fn render(self, view: &mut V, cx: &mut ViewContext) -> impl Element { if !self.panes.is_empty() { let el = div() .flex() diff --git a/crates/ui2/src/to_extract/project_panel.rs b/crates/ui2/src/to_extract/project_panel.rs index 018f9a4bf1..ccaaecf2ce 100644 --- a/crates/ui2/src/to_extract/project_panel.rs +++ b/crates/ui2/src/to_extract/project_panel.rs @@ -14,7 +14,7 @@ impl ProjectPanel { Self { id: id.into() } } - fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Component { + fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Element { div() .id(self.id.clone()) .flex() diff --git a/crates/ui2/src/to_extract/recent_projects.rs b/crates/ui2/src/to_extract/recent_projects.rs index 3d4f551490..2db7d94eac 100644 --- a/crates/ui2/src/to_extract/recent_projects.rs +++ b/crates/ui2/src/to_extract/recent_projects.rs @@ -11,7 +11,7 @@ impl RecentProjects { Self { id: id.into() } } - fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Component { + fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Element { div().id(self.id.clone()).child( Palette::new("palette") .items(vec![ diff --git a/crates/ui2/src/to_extract/tab_bar.rs b/crates/ui2/src/to_extract/tab_bar.rs index 3b4b5cc220..8888620dae 100644 --- a/crates/ui2/src/to_extract/tab_bar.rs +++ b/crates/ui2/src/to_extract/tab_bar.rs @@ -23,7 +23,7 @@ impl TabBar { self } - fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Component { + fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Element { let (can_navigate_back, can_navigate_forward) = self.can_navigate; div() diff --git a/crates/ui2/src/to_extract/terminal.rs b/crates/ui2/src/to_extract/terminal.rs index 6c36f35152..d639986082 100644 --- a/crates/ui2/src/to_extract/terminal.rs +++ b/crates/ui2/src/to_extract/terminal.rs @@ -11,7 +11,7 @@ impl Terminal { Self } - fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Component { + fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Element { let can_navigate_back = true; let can_navigate_forward = false; diff --git a/crates/ui2/src/to_extract/theme_selector.rs b/crates/ui2/src/to_extract/theme_selector.rs index 7f911b50bf..175d126133 100644 --- a/crates/ui2/src/to_extract/theme_selector.rs +++ b/crates/ui2/src/to_extract/theme_selector.rs @@ -11,7 +11,7 @@ impl ThemeSelector { Self { id: id.into() } } - fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Component { + fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Element { div().child( Palette::new(self.id.clone()) .items(vec![ diff --git a/crates/ui2/src/to_extract/toolbar.rs b/crates/ui2/src/to_extract/toolbar.rs index 81918f34a7..b7738ffb1c 100644 --- a/crates/ui2/src/to_extract/toolbar.rs +++ b/crates/ui2/src/to_extract/toolbar.rs @@ -20,7 +20,7 @@ impl Toolbar { } } - pub fn left_item(mut self, child: impl Component) -> Self + pub fn left_item(mut self, child: impl Element) -> Self where Self: Sized, { @@ -28,7 +28,7 @@ impl Toolbar { self } - pub fn left_items(mut self, iter: impl IntoIterator>) -> Self + pub fn left_items(mut self, iter: impl IntoIterator>) -> Self where Self: Sized, { @@ -37,7 +37,7 @@ impl Toolbar { self } - pub fn right_item(mut self, child: impl Component) -> Self + pub fn right_item(mut self, child: impl Element) -> Self where Self: Sized, { @@ -45,7 +45,7 @@ impl Toolbar { self } - pub fn right_items(mut self, iter: impl IntoIterator>) -> Self + pub fn right_items(mut self, iter: impl IntoIterator>) -> Self where Self: Sized, { @@ -54,7 +54,7 @@ impl Toolbar { self } - fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Component { + fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Element { div() .bg(cx.theme().colors().toolbar_background) .p_2() diff --git a/crates/ui2/src/to_extract/traffic_lights.rs b/crates/ui2/src/to_extract/traffic_lights.rs index 245ff377f2..8cab5594e6 100644 --- a/crates/ui2/src/to_extract/traffic_lights.rs +++ b/crates/ui2/src/to_extract/traffic_lights.rs @@ -21,7 +21,7 @@ impl TrafficLight { } } - fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Component { + fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Element { let system_colors = &cx.theme().styles.system; let fill = match (self.window_has_focus, self.color) { @@ -52,7 +52,7 @@ impl TrafficLights { self } - fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Component { + fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Element { div() .flex() .items_center() From be33f000e2cfda239637db52d645bffa93aef804 Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Sat, 18 Nov 2023 00:27:40 -0700 Subject: [PATCH 06/20] WIP: Lots of errors, starting on resurrecting derive Element --- crates/gpui2/src/element.rs | 2 +- crates/gpui2_macros/src/derive_element.rs | 75 +++++++++++++++++++++++ crates/gpui2_macros/src/gpui2_macros.rs | 18 +++--- crates/ui2/src/components/avatar.rs | 5 +- crates/ui2/src/components/toast.rs | 54 ++++++++-------- 5 files changed, 115 insertions(+), 39 deletions(-) create mode 100644 crates/gpui2_macros/src/derive_element.rs diff --git a/crates/gpui2/src/element.rs b/crates/gpui2/src/element.rs index 5220892885..f296e9214c 100644 --- a/crates/gpui2/src/element.rs +++ b/crates/gpui2/src/element.rs @@ -364,7 +364,7 @@ impl Element for AnyElement { fn paint( self, - bounds: Bounds, + _bounds: Bounds, view_state: &mut V, _: &mut Self::State, cx: &mut ViewContext, diff --git a/crates/gpui2_macros/src/derive_element.rs b/crates/gpui2_macros/src/derive_element.rs new file mode 100644 index 0000000000..e8c698c1fe --- /dev/null +++ b/crates/gpui2_macros/src/derive_element.rs @@ -0,0 +1,75 @@ +use proc_macro::TokenStream; +use quote::quote; +use syn::{parse_macro_input, DeriveInput, GenericParam}; + +pub fn derive_element(input: TokenStream) -> TokenStream { + let ast = parse_macro_input!(input as DeriveInput); + let type_name = ast.ident; + + let mut view_state_ty = quote! { V }; + + for param in &ast.generics.params { + if let GenericParam::Type(type_param) = param { + let type_ident = &type_param.ident; + view_state_ty = quote! {#type_ident}; + break; + } + } + + let attrs = &ast.attrs; + for attr in attrs { + if attr.path.is_ident("element") { + match attr.parse_meta() { + Ok(syn::Meta::List(i)) => { + for nested_meta in i.nested { + if let syn::NestedMeta::Meta(syn::Meta::NameValue(nv)) = nested_meta { + if nv.path.is_ident("view_state") { + if let syn::Lit::Str(lit_str) = nv.lit { + view_state_ty = lit_str.value().parse().unwrap(); + } + } + } + } + } + _ => (), + } + } + } + + let (impl_generics, ty_generics, where_clause) = ast.generics.split_for_impl(); + + let gen = quote! { + impl #impl_generics gpui::Element<#view_state_ty> for #type_name #ty_generics + #where_clause + { + type State = Option>; + + fn element_id(&self) -> Option { + None + } + + fn layout( + &mut self, + view_state: &mut #view_state_ty, + _element_state: Option, + cx: &mut gpui::ViewContext<#view_state_ty>, + ) -> (gpui::LayoutId, Self::State) { + let mut element = self.render(view_state, cx).into_any(); + let layout_id = element.layout(view_state, cx); + (layout_id, Some(element)) + } + + fn paint( + self, + _bounds: gpui::Bounds, + view_state: &mut #view_state_ty, + rendered_element: &mut Self::State, + cx: &mut gpui::ViewContext<#view_state_ty>, + ) { + rendered_element.take().unwrap().paint(view_state, cx) + } + } + }; + + gen.into() +} diff --git a/crates/gpui2_macros/src/gpui2_macros.rs b/crates/gpui2_macros/src/gpui2_macros.rs index 02c9629d01..a611727066 100644 --- a/crates/gpui2_macros/src/gpui2_macros.rs +++ b/crates/gpui2_macros/src/gpui2_macros.rs @@ -7,11 +7,6 @@ mod test; use proc_macro::TokenStream; -#[proc_macro] -pub fn style_helpers(args: TokenStream) -> TokenStream { - style_helpers::style_helpers(args) -} - #[proc_macro_derive(Action)] pub fn action(input: TokenStream) -> TokenStream { action::action(input) @@ -27,10 +22,15 @@ pub fn derive_component(input: TokenStream) -> TokenStream { derive_component::derive_component(input) } -// #[proc_macro_derive(Element)] -// pub fn derive_element(input: TokenStream) -> TokenStream { -// derive_element::derive_element(input) -// } +#[proc_macro_derive(Element, attributes(element))] +pub fn derive_element(input: TokenStream) -> TokenStream { + derive_element::derive_element(input) +} + +#[proc_macro] +pub fn style_helpers(input: TokenStream) -> TokenStream { + style_helpers::style_helpers(input) +} #[proc_macro_attribute] pub fn test(args: TokenStream, function: TokenStream) -> TokenStream { diff --git a/crates/ui2/src/components/avatar.rs b/crates/ui2/src/components/avatar.rs index 5ab00b33ed..95e0653d36 100644 --- a/crates/ui2/src/components/avatar.rs +++ b/crates/ui2/src/components/avatar.rs @@ -1,8 +1,7 @@ +use crate::prelude::*; use gpui::img; -use crate::prelude::*; - -#[derive(Component)] +#[derive(Element)] pub struct Avatar { src: SharedString, shape: Shape, diff --git a/crates/ui2/src/components/toast.rs b/crates/ui2/src/components/toast.rs index 08e850d2a2..a40f3cace4 100644 --- a/crates/ui2/src/components/toast.rs +++ b/crates/ui2/src/components/toast.rs @@ -1,4 +1,5 @@ use crate::prelude::*; +use gpui::Element; use gpui::{prelude::*, AnyElement}; use smallvec::SmallVec; @@ -21,40 +22,41 @@ pub enum ToastOrigin { /// they are actively showing the a process in progress. /// /// Only one toast may be visible at a time. +#[derive(Element)] pub struct Toast { origin: ToastOrigin, children: SmallVec<[AnyElement; 2]>, } -impl Element for Toast { - type State = Option>; +// impl Element for Toast { +// type State = Option>; - fn element_id(&self) -> Option { - None - } +// fn element_id(&self) -> Option { +// None +// } - fn layout( - &mut self, - view_state: &mut V, - _element_state: Option, - cx: &mut ViewContext, - ) -> (gpui::LayoutId, Self::State) { - let mut element = self.render(view_state, cx).into_any(); - let layout_id = element.layout(view_state, cx); - (layout_id, Some(element)) - } +// fn layout( +// &mut self, +// view_state: &mut V, +// _element_state: Option, +// cx: &mut ViewContext, +// ) -> (gpui::LayoutId, Self::State) { +// let mut element = self.render(view_state, cx).into_any(); +// let layout_id = element.layout(view_state, cx); +// (layout_id, Some(element)) +// } - fn paint( - self, - bounds: gpui::Bounds, - view_state: &mut V, - element: &mut Self::State, - cx: &mut ViewContext, - ) { - let element = element.take().unwrap(); - element.paint(view_state, cx); - } -} +// fn paint( +// self, +// bounds: gpui::Bounds, +// view_state: &mut V, +// element: &mut Self::State, +// cx: &mut ViewContext, +// ) { +// let element = element.take().unwrap(); +// element.paint(view_state, cx); +// } +// } impl Toast { pub fn new(origin: ToastOrigin) -> Self { From adc355a1e693fc63088118b542943fabc89a74f1 Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Sat, 18 Nov 2023 20:05:47 -0700 Subject: [PATCH 07/20] Element refinement passing on ui2 --- crates/collab_ui2/src/collab_panel.rs | 2 +- crates/collab_ui2/src/collab_titlebar_item.rs | 6 +- .../command_palette2/src/command_palette.rs | 2 +- crates/editor2/src/editor.rs | 12 +- crates/editor2/src/editor_tests.rs | 2 +- crates/editor2/src/element.rs | 6 +- crates/editor2/src/items.rs | 2 +- crates/file_finder2/src/file_finder.rs | 4 +- crates/go_to_line2/src/go_to_line.rs | 2 +- crates/gpui2/src/app.rs | 2 +- crates/gpui2/src/app/async_context.rs | 6 +- crates/gpui2/src/app/test_context.rs | 12 +- crates/gpui2/src/element.rs | 271 +++++++++++------- crates/gpui2/src/elements/div.rs | 80 +++--- crates/gpui2/src/elements/img.rs | 21 +- crates/gpui2/src/elements/overlay.rs | 20 +- crates/gpui2/src/elements/svg.rs | 21 +- crates/gpui2/src/elements/text.rs | 88 +++--- crates/gpui2/src/elements/uniform_list.rs | 30 +- crates/gpui2/src/gpui2.rs | 4 +- crates/gpui2/src/interactive.rs | 14 +- crates/gpui2/src/prelude.rs | 5 +- crates/gpui2/src/view.rs | 156 ++++++---- crates/gpui2/src/window.rs | 18 +- crates/gpui2_macros/src/derive_element.rs | 75 ----- crates/gpui2_macros/src/derive_render_once.rs | 64 +++++ crates/gpui2_macros/src/gpui2_macros.rs | 8 +- crates/project_panel2/src/project_panel.rs | 6 +- crates/storybook2/src/stories/text.rs | 4 +- crates/storybook2/src/stories/z_index.rs | 2 +- crates/terminal_view2/src/terminal_panel.rs | 2 +- crates/terminal_view2/src/terminal_view.rs | 7 +- crates/theme2/src/story.rs | 2 +- crates/theme2/src/styles/players.rs | 4 +- crates/ui2/src/components/avatar.rs | 36 +-- crates/ui2/src/components/button.rs | 87 +++++- crates/ui2/src/components/checkbox.rs | 130 ++++++++- crates/ui2/src/components/context_menu.rs | 29 +- crates/ui2/src/components/details.rs | 33 ++- crates/ui2/src/components/divider.rs | 4 +- crates/ui2/src/components/facepile.rs | 23 +- crates/ui2/src/components/icon.rs | 23 +- crates/ui2/src/components/icon_button.rs | 110 +++---- crates/ui2/src/components/indicator.rs | 20 +- crates/ui2/src/components/input.rs | 104 +++---- crates/ui2/src/components/keybinding.rs | 54 ++-- crates/ui2/src/components/label.rs | 121 ++++---- crates/ui2/src/components/list.rs | 169 ++++++++--- crates/ui2/src/components/modal.rs | 63 ++-- .../ui2/src/components/notification_toast.rs | 2 +- crates/ui2/src/components/palette.rs | 165 ++++++----- crates/ui2/src/components/panel.rs | 54 ++-- crates/ui2/src/components/player_stack.rs | 22 +- crates/ui2/src/components/tab.rs | 128 +++++---- crates/ui2/src/components/toast.rs | 58 ++-- crates/ui2/src/components/toggle.rs | 2 +- crates/ui2/src/components/tool_divider.rs | 11 +- crates/ui2/src/components/tooltip.rs | 4 +- crates/ui2/src/prelude.rs | 4 +- crates/ui2/src/static_data.rs | 66 ++--- crates/ui2/src/story.rs | 14 +- crates/ui2/src/to_extract/assistant_panel.rs | 38 +-- crates/ui2/src/to_extract/breadcrumb.rs | 45 +-- crates/ui2/src/to_extract/buffer.rs | 25 +- crates/ui2/src/to_extract/buffer_search.rs | 5 +- crates/ui2/src/to_extract/chat_panel.rs | 60 ++-- crates/ui2/src/to_extract/collab_panel.rs | 20 +- crates/ui2/src/to_extract/command_palette.rs | 19 +- crates/ui2/src/to_extract/copilot.rs | 33 ++- crates/ui2/src/to_extract/editor_pane.rs | 4 +- .../ui2/src/to_extract/language_selector.rs | 30 +- crates/ui2/src/to_extract/multi_buffer.rs | 19 +- .../ui2/src/to_extract/notifications_panel.rs | 180 ++++++------ crates/ui2/src/to_extract/panes.rs | 87 +++--- crates/ui2/src/to_extract/project_panel.rs | 42 ++- crates/ui2/src/to_extract/recent_projects.rs | 19 +- crates/ui2/src/to_extract/status_bar.rs | 48 ++-- crates/ui2/src/to_extract/tab_bar.rs | 38 +-- crates/ui2/src/to_extract/terminal.rs | 75 ++++- crates/ui2/src/to_extract/theme_selector.rs | 20 +- crates/ui2/src/to_extract/title_bar.rs | 6 +- crates/ui2/src/to_extract/toolbar.rs | 54 ++-- crates/ui2/src/to_extract/traffic_lights.rs | 55 ++-- crates/ui2/src/to_extract/workspace.rs | 6 +- crates/workspace2/src/dock.rs | 2 +- crates/workspace2/src/status_bar.rs | 4 +- crates/workspace2/src/workspace2.rs | 8 +- 87 files changed, 2066 insertions(+), 1372 deletions(-) delete mode 100644 crates/gpui2_macros/src/derive_element.rs create mode 100644 crates/gpui2_macros/src/derive_render_once.rs diff --git a/crates/collab_ui2/src/collab_panel.rs b/crates/collab_ui2/src/collab_panel.rs index 20e77d7023..22f6dc9d88 100644 --- a/crates/collab_ui2/src/collab_panel.rs +++ b/crates/collab_ui2/src/collab_panel.rs @@ -160,7 +160,7 @@ use std::sync::Arc; use db::kvp::KEY_VALUE_STORE; use gpui::{ actions, div, serde_json, AppContext, AsyncWindowContext, Div, EventEmitter, FocusHandle, - Focusable, FocusableView, InteractiveComponent, ParentComponent, Render, View, ViewContext, + Focusable, FocusableView, InteractiveElement, ParentElement, Render, View, ViewContext, VisualContext, WeakView, }; use project::Fs; diff --git a/crates/collab_ui2/src/collab_titlebar_item.rs b/crates/collab_ui2/src/collab_titlebar_item.rs index ed010cc500..570ff9f45e 100644 --- a/crates/collab_ui2/src/collab_titlebar_item.rs +++ b/crates/collab_ui2/src/collab_titlebar_item.rs @@ -31,9 +31,9 @@ use std::sync::Arc; use call::ActiveCall; use client::{Client, UserStore}; use gpui::{ - div, px, rems, AppContext, Component, Div, InteractiveComponent, Model, ParentComponent, - Render, Stateful, StatefulInteractiveComponent, Styled, Subscription, ViewContext, - VisualContext, WeakView, WindowBounds, + div, px, rems, AppContext, Component, Div, InteractiveElement, Model, ParentElement, Render, + Stateful, StatefulInteractiveElement, Styled, Subscription, ViewContext, VisualContext, + WeakView, WindowBounds, }; use project::Project; use theme::ActiveTheme; diff --git a/crates/command_palette2/src/command_palette.rs b/crates/command_palette2/src/command_palette.rs index 9463cab68c..7e4994638e 100644 --- a/crates/command_palette2/src/command_palette.rs +++ b/crates/command_palette2/src/command_palette.rs @@ -2,7 +2,7 @@ use collections::{CommandPaletteFilter, HashMap}; use fuzzy::{StringMatch, StringMatchCandidate}; use gpui::{ actions, div, prelude::*, Action, AppContext, Component, Dismiss, Div, FocusHandle, Keystroke, - ManagedView, ParentComponent, Render, Styled, View, ViewContext, VisualContext, WeakView, + ManagedView, ParentElement, Render, Styled, View, ViewContext, VisualContext, WeakView, }; use picker::{Picker, PickerDelegate}; use std::{ diff --git a/crates/editor2/src/editor.rs b/crates/editor2/src/editor.rs index b1dc76852d..214c46551f 100644 --- a/crates/editor2/src/editor.rs +++ b/crates/editor2/src/editor.rs @@ -42,7 +42,7 @@ use gpui::{ actions, div, point, prelude::*, px, relative, rems, size, uniform_list, Action, AnyElement, AppContext, AsyncWindowContext, BackgroundExecutor, Bounds, ClipboardItem, Component, Context, EventEmitter, FocusHandle, FocusableView, FontFeatures, FontStyle, FontWeight, HighlightStyle, - Hsla, InputHandler, KeyContext, Model, MouseButton, ParentComponent, Pixels, Render, Styled, + Hsla, InputHandler, KeyContext, Model, MouseButton, ParentElement, Pixels, Render, Styled, Subscription, Task, TextStyle, UniformListScrollHandle, View, ViewContext, VisualContext, WeakView, WindowContext, }; @@ -1595,7 +1595,7 @@ impl CodeActionsMenu { .max_by_key(|(_, action)| action.lsp_action.title.chars().count()) .map(|(ix, _)| ix), ) - .render(); + .render_once(); if self.deployed_from_indicator { *cursor_position.column_mut() = 0; @@ -4365,7 +4365,7 @@ impl Editor { cx, ); }) - .render(), + .into_any(), ) } else { None @@ -4401,7 +4401,7 @@ impl Editor { editor.fold_at(&FoldAt { buffer_row }, cx); } }) - .render() + .into_any() }) }) .flatten() @@ -7792,7 +7792,7 @@ impl Editor { cx.editor_style.diagnostic_style.clone(), }, ))) - .render() + .render_once() } }), disposition: BlockDisposition::Below, @@ -9994,7 +9994,7 @@ pub fn diagnostic_block_renderer(diagnostic: Diagnostic, is_valid: bool) -> Rend cx.write_to_clipboard(ClipboardItem::new(message.clone())); }) .tooltip(|_, cx| Tooltip::text("Copy diagnostic message", cx)) - .render() + .render_once() }) } diff --git a/crates/editor2/src/editor_tests.rs b/crates/editor2/src/editor_tests.rs index bd69e7acdf..f23618aa21 100644 --- a/crates/editor2/src/editor_tests.rs +++ b/crates/editor2/src/editor_tests.rs @@ -3048,7 +3048,7 @@ fn test_move_line_up_down_with_blocks(cx: &mut TestAppContext) { position: snapshot.anchor_after(Point::new(2, 0)), disposition: BlockDisposition::Below, height: 1, - render: Arc::new(|_| div().render()), + render: Arc::new(|_| div().render_once()), }], Some(Autoscroll::fit()), cx, diff --git a/crates/editor2/src/element.rs b/crates/editor2/src/element.rs index 2de9182901..0ee710da47 100644 --- a/crates/editor2/src/element.rs +++ b/crates/editor2/src/element.rs @@ -20,9 +20,9 @@ use collections::{BTreeMap, HashMap}; use gpui::{ div, point, px, relative, size, transparent_black, Action, AnyElement, AvailableSpace, BorrowWindow, Bounds, Component, ContentMask, Corners, DispatchPhase, Edges, Element, - ElementId, ElementInputHandler, Entity, EntityId, Hsla, InteractiveComponent, LineLayout, - MouseButton, MouseDownEvent, MouseMoveEvent, MouseUpEvent, ParentComponent, Pixels, - ScrollWheelEvent, ShapedLine, SharedString, Size, StatefulInteractiveComponent, Style, Styled, + ElementId, ElementInputHandler, Entity, EntityId, Hsla, InteractiveElement, LineLayout, + MouseButton, MouseDownEvent, MouseMoveEvent, MouseUpEvent, ParentElement, Pixels, + ScrollWheelEvent, ShapedLine, SharedString, Size, StatefulInteractiveElement, Style, Styled, TextRun, TextStyle, View, ViewContext, WindowContext, WrappedLine, }; use itertools::Itertools; diff --git a/crates/editor2/src/items.rs b/crates/editor2/src/items.rs index cf2bf5b6dc..ef0f48193c 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, ParentComponent, Pixels, SharedString, Styled, Subscription, Task, View, + FocusHandle, Model, ParentElement, Pixels, SharedString, Styled, Subscription, Task, View, ViewContext, VisualContext, WeakView, }; use language::{ diff --git a/crates/file_finder2/src/file_finder.rs b/crates/file_finder2/src/file_finder.rs index 0fee5102e6..3488b6916c 100644 --- a/crates/file_finder2/src/file_finder.rs +++ b/crates/file_finder2/src/file_finder.rs @@ -2,8 +2,8 @@ use collections::HashMap; use editor::{scroll::autoscroll::Autoscroll, Bias, Editor}; use fuzzy::{CharBag, PathMatch, PathMatchCandidate}; use gpui::{ - actions, div, AppContext, Component, Dismiss, Div, FocusHandle, InteractiveComponent, - ManagedView, Model, ParentComponent, Render, Styled, Task, View, ViewContext, VisualContext, + actions, div, AppContext, Component, Dismiss, Div, FocusHandle, InteractiveElement, + ManagedView, Model, ParentElement, Render, Styled, Task, View, ViewContext, VisualContext, WeakView, }; use picker::{Picker, PickerDelegate}; diff --git a/crates/go_to_line2/src/go_to_line.rs b/crates/go_to_line2/src/go_to_line.rs index 565afb5e93..26641bfa09 100644 --- a/crates/go_to_line2/src/go_to_line.rs +++ b/crates/go_to_line2/src/go_to_line.rs @@ -1,6 +1,6 @@ use editor::{display_map::ToDisplayPoint, scroll::autoscroll::Autoscroll, Editor}; use gpui::{ - actions, div, prelude::*, AppContext, Dismiss, Div, FocusHandle, ManagedView, ParentComponent, + actions, div, prelude::*, AppContext, Dismiss, Div, FocusHandle, ManagedView, ParentElement, Render, SharedString, Styled, Subscription, View, ViewContext, VisualContext, WindowContext, }; use text::{Bias, Point}; diff --git a/crates/gpui2/src/app.rs b/crates/gpui2/src/app.rs index 397b770c2b..0a1e571872 100644 --- a/crates/gpui2/src/app.rs +++ b/crates/gpui2/src/app.rs @@ -424,7 +424,7 @@ impl AppContext { /// Opens a new window with the given option and the root view returned by the given function. /// The function is invoked with a `WindowContext`, which can be used to interact with window-specific /// functionality. - pub fn open_window( + pub fn open_window>( &mut self, options: crate::WindowOptions, build_root_view: impl FnOnce(&mut WindowContext) -> View, diff --git a/crates/gpui2/src/app/async_context.rs b/crates/gpui2/src/app/async_context.rs index 83b3ccebe7..afb6050037 100644 --- a/crates/gpui2/src/app/async_context.rs +++ b/crates/gpui2/src/app/async_context.rs @@ -115,7 +115,7 @@ impl AsyncAppContext { build_root_view: impl FnOnce(&mut WindowContext) -> View, ) -> Result> where - V: Render, + V: 'static + Render, { let app = self .app @@ -286,7 +286,7 @@ impl VisualContext for AsyncWindowContext { build_view_state: impl FnOnce(&mut ViewContext<'_, V>) -> V, ) -> Self::Result> where - V: 'static + Render, + V: 'static + Render, { self.window .update(self, |_, cx| cx.build_view(build_view_state)) @@ -306,7 +306,7 @@ impl VisualContext for AsyncWindowContext { build_view: impl FnOnce(&mut ViewContext<'_, V>) -> V, ) -> Self::Result> where - V: Render, + V: 'static + Render, { self.window .update(self, |_, cx| cx.replace_root_view(build_view)) diff --git a/crates/gpui2/src/app/test_context.rs b/crates/gpui2/src/app/test_context.rs index 940492573f..06893a1772 100644 --- a/crates/gpui2/src/app/test_context.rs +++ b/crates/gpui2/src/app/test_context.rs @@ -126,7 +126,7 @@ impl TestAppContext { pub fn add_window(&mut self, build_window: F) -> WindowHandle where F: FnOnce(&mut ViewContext) -> V, - V: Render, + V: 'static + Render, { let mut cx = self.app.borrow_mut(); cx.open_window(WindowOptions::default(), |cx| cx.build_view(build_window)) @@ -143,7 +143,7 @@ impl TestAppContext { pub fn add_window_view(&mut self, build_window: F) -> (View, &mut VisualTestContext) where F: FnOnce(&mut ViewContext) -> V, - V: Render, + V: 'static + Render, { let mut cx = self.app.borrow_mut(); let window = cx.open_window(WindowOptions::default(), |cx| cx.build_view(build_window)); @@ -543,7 +543,7 @@ impl<'a> VisualContext for VisualTestContext<'a> { build_view: impl FnOnce(&mut ViewContext<'_, V>) -> V, ) -> Self::Result> where - V: 'static + Render, + V: 'static + Render, { self.window .update(self.cx, |_, cx| cx.build_view(build_view)) @@ -565,7 +565,7 @@ impl<'a> VisualContext for VisualTestContext<'a> { build_view: impl FnOnce(&mut ViewContext<'_, V>) -> V, ) -> Self::Result> where - V: Render, + V: 'static + Render, { self.window .update(self.cx, |_, cx| cx.replace_root_view(build_view)) @@ -582,7 +582,7 @@ impl<'a> VisualContext for VisualTestContext<'a> { } impl AnyWindowHandle { - pub fn build_view( + pub fn build_view + 'static>( &self, cx: &mut TestAppContext, build_view: impl FnOnce(&mut ViewContext<'_, V>) -> V, @@ -593,7 +593,7 @@ impl AnyWindowHandle { pub struct EmptyView {} -impl Render for EmptyView { +impl Render for EmptyView { type Element = Div; fn render(&mut self, _cx: &mut crate::ViewContext) -> Self::Element { diff --git a/crates/gpui2/src/element.rs b/crates/gpui2/src/element.rs index f296e9214c..c60c902e25 100644 --- a/crates/gpui2/src/element.rs +++ b/crates/gpui2/src/element.rs @@ -3,9 +3,53 @@ use crate::{ }; use derive_more::{Deref, DerefMut}; pub(crate) use smallvec::SmallVec; -use std::{any::Any, fmt::Debug}; +use std::{any::Any, fmt::Debug, marker::PhantomData}; -pub trait Element: 'static + Sized { +pub trait Render: 'static + Sized { + type Element: Element + 'static; + + fn render(&mut self, cx: &mut ViewContext) -> Self::Element; +} + +pub trait RenderOnce: Sized { + type Element: Element + 'static; + + fn render_once(self) -> Self::Element; + + fn render_into_any(self) -> AnyElement { + self.render_once().into_any() + } + + fn map(self, f: impl FnOnce(Self) -> U) -> U + where + Self: Sized, + U: RenderOnce, + { + f(self) + } + + fn when(self, condition: bool, then: impl FnOnce(Self) -> Self) -> Self + where + Self: Sized, + { + self.map(|this| if condition { then(this) } else { this }) + } + + fn when_some(self, option: Option, then: impl FnOnce(Self, T) -> Self) -> Self + where + Self: Sized, + { + self.map(|this| { + if let Some(value) = option { + then(this, value) + } else { + this + } + }) + } +} + +pub trait Element: 'static + RenderOnce { type State: 'static; fn element_id(&self) -> Option; @@ -59,26 +103,105 @@ pub trait Element: 'static + Sized { } } +pub trait Component: 'static { + type Rendered: RenderOnce; + + fn render(self, view: &mut V, cx: &mut ViewContext) -> Self::Rendered; +} + +pub struct CompositeElement { + component: Option, + view_type: PhantomData, +} + +pub struct CompositeElementState> { + rendered_element: Option<>::Element>, + rendered_element_state: <>::Element as Element>::State, +} + +impl CompositeElement { + pub fn new(component: C) -> Self { + CompositeElement { + component: Some(component), + view_type: PhantomData, + } + } +} + +impl> Element for CompositeElement { + type State = CompositeElementState; + + fn element_id(&self) -> Option { + None + } + + fn layout( + &mut self, + view: &mut V, + state: Option, + cx: &mut ViewContext, + ) -> (LayoutId, Self::State) { + let mut element = self + .component + .take() + .unwrap() + .render(view, cx) + .render_once(); + let (layout_id, state) = element.layout(view, state.map(|s| s.rendered_element_state), cx); + let state = CompositeElementState { + rendered_element: Some(element), + rendered_element_state: state, + }; + (layout_id, state) + } + + fn paint( + self, + bounds: Bounds, + view: &mut V, + state: &mut Self::State, + cx: &mut ViewContext, + ) { + state.rendered_element.take().unwrap().paint( + bounds, + view, + &mut state.rendered_element_state, + cx, + ); + } +} + +impl> RenderOnce for CompositeElement { + type Element = Self; + + fn render_once(self) -> Self::Element { + self + } +} + #[derive(Deref, DerefMut, Default, Clone, Debug, Eq, PartialEq, Hash)] pub struct GlobalElementId(SmallVec<[ElementId; 32]>); -pub trait ParentComponent { +pub trait ParentElement { fn children_mut(&mut self) -> &mut SmallVec<[AnyElement; 2]>; - fn child(mut self, child: impl Element) -> Self + fn child(mut self, child: impl RenderOnce) -> Self where Self: Sized, { - self.children_mut().push(child.into_any()); + self.children_mut().push(child.render_once().into_any()); self } - fn children(mut self, children: impl IntoIterator>) -> Self + fn children(mut self, children: impl IntoIterator>) -> Self where Self: Sized, { - self.children_mut() - .extend(children.into_iter().map(Element::into_any)); + self.children_mut().extend( + children + .into_iter() + .map(|child| child.render_once().into_any()), + ); self } } @@ -301,7 +424,7 @@ where pub struct AnyElement(Box>); -impl AnyElement { +impl AnyElement { pub fn new(element: E) -> Self where V: 'static, @@ -343,6 +466,11 @@ impl AnyElement { ) { self.0.draw(origin, available_space, view_state, cx) } + + /// Converts this `AnyElement` into a trait object that can be stored and manipulated. + pub fn into_any(self) -> AnyElement { + AnyElement::new(self) + } } impl Element for AnyElement { @@ -373,105 +501,18 @@ impl Element for AnyElement { } } -pub trait Component { - fn render(self) -> AnyElement; +impl RenderOnce for AnyElement { + type Element = Self; - fn map(self, f: impl FnOnce(Self) -> U) -> U - where - Self: Sized, - U: Component, - { - f(self) - } - - fn when(self, condition: bool, then: impl FnOnce(Self) -> Self) -> Self - where - Self: Sized, - { - self.map(|this| if condition { then(this) } else { this }) - } - - fn when_some(self, option: Option, then: impl FnOnce(Self, T) -> Self) -> Self - where - Self: Sized, - { - self.map(|this| { - if let Some(value) = option { - then(this, value) - } else { - this - } - }) - } -} - -impl Component for AnyElement { - fn render(self) -> AnyElement { + fn render_once(self) -> Self::Element { self } } -impl Element for Option -where - V: 'static, - E: 'static + Component, - F: FnOnce(&mut V, &mut ViewContext<'_, V>) -> E + 'static, -{ - type State = Option>; - - fn element_id(&self) -> Option { - None - } - - fn layout( - &mut self, - view_state: &mut V, - _: Option, - cx: &mut ViewContext, - ) -> (LayoutId, Self::State) { - let render = self.take().unwrap(); - let mut rendered_element = (render)(view_state, cx).render(); - let layout_id = rendered_element.layout(view_state, cx); - (layout_id, Some(rendered_element)) - } - - fn paint( - self, - _bounds: Bounds, - view_state: &mut V, - rendered_element: &mut Self::State, - cx: &mut ViewContext, - ) { - rendered_element.take().unwrap().paint(view_state, cx); - } -} - -impl Component for Option -where - V: 'static, - E: 'static + Component, - F: FnOnce(&mut V, &mut ViewContext<'_, V>) -> E + 'static, -{ - fn render(self) -> AnyElement { - AnyElement::new(self) - } -} - -impl Component for F -where - V: 'static, - E: 'static + Component, - F: FnOnce(&mut V, &mut ViewContext<'_, V>) -> E + 'static, -{ - fn render(self) -> AnyElement { - AnyElement::new(Some(self)) - } -} - -// impl Element for F +// impl Element for Option // where // V: 'static, -// E: 'static + Component, +// E: Element, // F: FnOnce(&mut V, &mut ViewContext<'_, V>) -> E + 'static, // { // type State = Option>; @@ -483,21 +524,35 @@ where // fn layout( // &mut self, // view_state: &mut V, -// element_state: Option, +// _: Option, // cx: &mut ViewContext, // ) -> (LayoutId, Self::State) { - -// self(view_state) - +// let render = self.take().unwrap(); +// let mut element = (render)(view_state, cx).into_any(); +// let layout_id = element.layout(view_state, cx); +// (layout_id, Some(element)) // } // fn paint( // self, -// bounds: Bounds, +// _bounds: Bounds, // view_state: &mut V, -// element_state: &mut Self::State, +// rendered_element: &mut Self::State, // cx: &mut ViewContext, // ) { -// todo!() +// rendered_element.take().unwrap().paint(view_state, cx); +// } +// } + +// impl RenderOnce for Option +// where +// V: 'static, +// E: Element, +// F: FnOnce(&mut V, &mut ViewContext) -> E + 'static, +// { +// type Element = Self; + +// fn render(self) -> Self::Element { +// self // } // } diff --git a/crates/gpui2/src/elements/div.rs b/crates/gpui2/src/elements/div.rs index 1a70a9bab2..26de4ea25f 100644 --- a/crates/gpui2/src/elements/div.rs +++ b/crates/gpui2/src/elements/div.rs @@ -1,9 +1,9 @@ use crate::{ point, px, Action, AnyDrag, AnyElement, AnyTooltip, AnyView, AppContext, BorrowAppContext, - 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, + BorrowWindow, Bounds, ClickEvent, DispatchPhase, Element, ElementId, FocusEvent, FocusHandle, + KeyContext, KeyDownEvent, KeyUpEvent, LayoutId, MouseButton, MouseDownEvent, MouseMoveEvent, + MouseUpEvent, ParentElement, Pixels, Point, Render, RenderOnce, ScrollWheelEvent, SharedString, + Size, Style, StyleRefinement, Styled, Task, View, ViewContext, Visibility, }; use collections::HashMap; use refineable::Refineable; @@ -28,7 +28,7 @@ pub struct GroupStyle { pub style: StyleRefinement, } -pub trait InteractiveComponent: Sized + Element { +pub trait InteractiveElement: Sized + Element { fn interactivity(&mut self) -> &mut Interactivity; fn group(mut self, group: impl Into) -> Self { @@ -314,7 +314,7 @@ pub trait InteractiveComponent: Sized + Element { } } -pub trait StatefulInteractiveComponent>: InteractiveComponent { +pub trait StatefulInteractiveElement>: InteractiveElement { fn focusable(mut self) -> Focusable { self.interactivity().focusable = true; Focusable { @@ -381,7 +381,7 @@ pub trait StatefulInteractiveComponent>: InteractiveCo ) -> Self where Self: Sized, - W: 'static + Render, + W: 'static + Render, { debug_assert!( self.interactivity().drag_listener.is_none(), @@ -425,7 +425,7 @@ pub trait StatefulInteractiveComponent>: InteractiveCo } } -pub trait FocusableComponent: InteractiveComponent { +pub trait FocusableElement: InteractiveElement { fn focus(mut self, f: impl FnOnce(StyleRefinement) -> StyleRefinement) -> Self where Self: Sized, @@ -587,13 +587,13 @@ impl Styled for Div { } } -impl InteractiveComponent for Div { +impl InteractiveElement for Div { fn interactivity(&mut self) -> &mut Interactivity { &mut self.interactivity } } -impl ParentComponent for Div { +impl ParentElement for Div { fn children_mut(&mut self) -> &mut SmallVec<[AnyElement; 2]> { &mut self.children } @@ -691,9 +691,11 @@ impl Element for Div { } } -impl Component for Div { - fn render(self) -> AnyElement { - AnyElement::new(self) +impl RenderOnce for Div { + type Element = Self; + + fn render_once(self) -> Self::Element { + self } } @@ -1257,19 +1259,19 @@ pub struct Focusable { view_type: PhantomData, } -impl> FocusableComponent for Focusable {} +impl, E: InteractiveElement> FocusableElement for Focusable {} -impl InteractiveComponent for Focusable +impl InteractiveElement for Focusable where - V: 'static, - E: InteractiveComponent, + V: 'static + Render, + E: InteractiveElement, { fn interactivity(&mut self) -> &mut Interactivity { self.element.interactivity() } } -impl> StatefulInteractiveComponent +impl, E: StatefulInteractiveElement> StatefulInteractiveElement for Focusable { } @@ -1286,7 +1288,7 @@ where impl Element for Focusable where - V: 'static, + V: 'static + Render, E: Element, { type State = E::State; @@ -1315,20 +1317,22 @@ where } } -impl Component for Focusable +impl RenderOnce for Focusable where - V: 'static, - E: 'static + Element, + V: 'static + Render, + E: Element, { - fn render(self) -> AnyElement { - AnyElement::new(self) + type Element = Self; + + fn render_once(self) -> Self::Element { + self } } -impl ParentComponent for Focusable +impl ParentElement for Focusable where V: 'static, - E: ParentComponent, + E: ParentElement, { fn children_mut(&mut self) -> &mut SmallVec<[AnyElement; 2]> { self.element.children_mut() @@ -1350,25 +1354,25 @@ where } } -impl StatefulInteractiveComponent for Stateful +impl StatefulInteractiveElement for Stateful where V: 'static, E: Element, - Self: InteractiveComponent, + Self: InteractiveElement, { } -impl InteractiveComponent for Stateful +impl InteractiveElement for Stateful where V: 'static, - E: InteractiveComponent, + E: InteractiveElement, { fn interactivity(&mut self) -> &mut Interactivity { self.element.interactivity() } } -impl> FocusableComponent for Stateful {} +impl> FocusableElement for Stateful {} impl Element for Stateful where @@ -1401,20 +1405,22 @@ where } } -impl Component for Stateful +impl RenderOnce for Stateful where V: 'static, - E: 'static + Element, + E: Element, { - fn render(self) -> AnyElement { - AnyElement::new(self) + type Element = Self; + + fn render_once(self) -> Self::Element { + self } } -impl ParentComponent for Stateful +impl ParentElement for Stateful where V: 'static, - E: ParentComponent, + E: ParentElement, { fn children_mut(&mut self) -> &mut SmallVec<[AnyElement; 2]> { self.element.children_mut() diff --git a/crates/gpui2/src/elements/img.rs b/crates/gpui2/src/elements/img.rs index db55bd0dc6..16f20869ab 100644 --- a/crates/gpui2/src/elements/img.rs +++ b/crates/gpui2/src/elements/img.rs @@ -1,7 +1,6 @@ use crate::{ - AnyElement, BorrowWindow, Bounds, Component, Element, InteractiveComponent, - InteractiveElementState, Interactivity, LayoutId, Pixels, SharedString, StyleRefinement, - Styled, ViewContext, + BorrowWindow, Bounds, Element, InteractiveElement, InteractiveElementState, Interactivity, + LayoutId, Pixels, RenderOnce, SharedString, StyleRefinement, Styled, ViewContext, }; use futures::FutureExt; use util::ResultExt; @@ -35,12 +34,6 @@ where } } -impl Component for Img { - fn render(self) -> AnyElement { - AnyElement::new(self) - } -} - impl Element for Img { type State = InteractiveElementState; @@ -102,13 +95,21 @@ impl Element for Img { } } +impl RenderOnce for Img { + type Element = Self; + + fn render_once(self) -> Self::Element { + self + } +} + impl Styled for Img { fn style(&mut self) -> &mut StyleRefinement { &mut self.interactivity.base_style } } -impl InteractiveComponent for Img { +impl InteractiveElement for Img { fn interactivity(&mut self) -> &mut Interactivity { &mut self.interactivity } diff --git a/crates/gpui2/src/elements/overlay.rs b/crates/gpui2/src/elements/overlay.rs index 394030f3d7..4e01b8aad1 100644 --- a/crates/gpui2/src/elements/overlay.rs +++ b/crates/gpui2/src/elements/overlay.rs @@ -2,8 +2,8 @@ use smallvec::SmallVec; use taffy::style::{Display, Position}; use crate::{ - point, AnyElement, BorrowWindow, Bounds, Component, Element, LayoutId, ParentComponent, Pixels, - Point, Size, Style, + point, AnyElement, BorrowWindow, Bounds, Element, LayoutId, ParentElement, Pixels, Point, + RenderOnce, Size, Style, }; pub struct OverlayState { @@ -51,18 +51,12 @@ impl Overlay { } } -impl ParentComponent for Overlay { +impl ParentElement for Overlay { fn children_mut(&mut self) -> &mut SmallVec<[AnyElement; 2]> { &mut self.children } } -impl Component for Overlay { - fn render(self) -> AnyElement { - AnyElement::new(self) - } -} - impl Element for Overlay { type State = OverlayState; @@ -163,6 +157,14 @@ impl Element for Overlay { } } +impl RenderOnce for Overlay { + type Element = Self; + + fn render_once(self) -> Self::Element { + self + } +} + enum Axis { Horizontal, Vertical, diff --git a/crates/gpui2/src/elements/svg.rs b/crates/gpui2/src/elements/svg.rs index 7d9c04b729..f6823c50d5 100644 --- a/crates/gpui2/src/elements/svg.rs +++ b/crates/gpui2/src/elements/svg.rs @@ -1,7 +1,6 @@ use crate::{ - AnyElement, Bounds, Component, Element, ElementId, InteractiveComponent, - InteractiveElementState, Interactivity, LayoutId, Pixels, SharedString, StyleRefinement, - Styled, ViewContext, + Bounds, Element, ElementId, InteractiveElement, InteractiveElementState, Interactivity, + LayoutId, Pixels, RenderOnce, SharedString, StyleRefinement, Styled, ViewContext, }; use util::ResultExt; @@ -24,12 +23,6 @@ impl Svg { } } -impl Component for Svg { - fn render(self) -> AnyElement { - AnyElement::new(self) - } -} - impl Element for Svg { type State = InteractiveElementState; @@ -66,13 +59,21 @@ impl Element for Svg { } } +impl RenderOnce for Svg { + type Element = Self; + + fn render_once(self) -> Self::Element { + self + } +} + impl Styled for Svg { fn style(&mut self) -> &mut StyleRefinement { &mut self.interactivity.base_style } } -impl InteractiveComponent for Svg { +impl InteractiveElement 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 c6090fdfb4..bfd63d3c3d 100644 --- a/crates/gpui2/src/elements/text.rs +++ b/crates/gpui2/src/elements/text.rs @@ -1,6 +1,6 @@ use crate::{ - AnyElement, BorrowWindow, Bounds, Component, Element, ElementId, LayoutId, Pixels, - SharedString, Size, TextRun, ViewContext, WindowContext, WrappedLine, + BorrowWindow, Bounds, Element, ElementId, LayoutId, Pixels, RenderOnce, SharedString, Size, + TextRun, ViewContext, WindowContext, WrappedLine, }; use anyhow::anyhow; use parking_lot::{Mutex, MutexGuard}; @@ -37,6 +37,14 @@ impl Element for &'static str { } } +impl RenderOnce for &'static str { + type Element = Self; + + fn render_once(self) -> Self::Element { + self + } +} + impl Element for SharedString { type State = TextState; @@ -67,32 +75,34 @@ impl Element for SharedString { } } -pub struct Text { +impl RenderOnce for SharedString { + type Element = Self; + + fn render_once(self) -> Self::Element { + self + } +} + +pub struct StyledText { text: SharedString, runs: Option>, } -impl Text { +impl StyledText { /// Renders text with runs of different styles. /// /// Callers are responsible for setting the correct style for each run. /// For text with a uniform style, you can usually avoid calling this constructor /// and just pass text directly. - pub fn styled(text: SharedString, runs: Vec) -> Self { - Text { + pub fn new(text: SharedString, runs: Vec) -> Self { + StyledText { text, runs: Some(runs), } } } -impl Component for Text { - fn render(self) -> AnyElement { - AnyElement::new(self) - } -} - -impl Element for Text { +impl Element for StyledText { type State = TextState; fn element_id(&self) -> Option { @@ -181,9 +191,22 @@ impl Element for Text { } } +impl RenderOnce for StyledText { + type Element = Self; + + fn render_once(self) -> Self::Element { + self + } +} + #[derive(Default, Clone)] pub struct TextState(Arc>>); +struct TextStateInner { + lines: SmallVec<[WrappedLine; 1]>, + line_height: Pixels, +} + impl TextState { fn lock(&self) -> MutexGuard> { self.0.lock() @@ -264,14 +287,9 @@ impl TextState { } } -struct TextStateInner { - lines: SmallVec<[WrappedLine; 1]>, - line_height: Pixels, -} - struct InteractiveText { id: ElementId, - text: Text, + text: StyledText, } struct InteractiveTextState { @@ -325,34 +343,10 @@ impl Element for InteractiveText { } } -impl Component for SharedString { - fn render(self) -> AnyElement { - Text { - text: self, - runs: None, - } - .render() - } -} +impl RenderOnce for InteractiveText { + type Element = Self; -impl Component for &'static str { - fn render(self) -> AnyElement { - Text { - text: self.into(), - runs: None, - } - .render() - } -} - -// TODO: Figure out how to pass `String` to `child` without this. -// This impl doesn't exist in the `gpui2` crate. -impl Component for String { - fn render(self) -> AnyElement { - Text { - text: self.into(), - runs: None, - } - .render() + fn render_once(self) -> Self::Element { + self } } diff --git a/crates/gpui2/src/elements/uniform_list.rs b/crates/gpui2/src/elements/uniform_list.rs index d7339d00ab..997904d913 100644 --- a/crates/gpui2/src/elements/uniform_list.rs +++ b/crates/gpui2/src/elements/uniform_list.rs @@ -1,7 +1,7 @@ use crate::{ - point, px, size, AnyElement, AvailableSpace, BorrowWindow, Bounds, Component, Element, - ElementId, InteractiveComponent, InteractiveElementState, Interactivity, LayoutId, Pixels, - Point, Size, StyleRefinement, Styled, ViewContext, + point, px, size, AnyElement, AvailableSpace, BorrowWindow, Bounds, Element, ElementId, + InteractiveElement, InteractiveElementState, Interactivity, LayoutId, Pixels, Point, + RenderOnce, Size, StyleRefinement, Styled, ViewContext, }; use smallvec::SmallVec; use std::{cell::RefCell, cmp, ops::Range, rc::Rc}; @@ -10,15 +10,15 @@ 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( +pub fn uniform_list( id: I, item_count: usize, - f: impl 'static + Fn(&mut V, Range, &mut ViewContext) -> Vec, + f: impl 'static + Fn(&mut V, Range, &mut ViewContext) -> Vec, ) -> UniformList where I: Into, V: 'static, - C: Component, + E: Element, { let id = id.into(); let mut style = StyleRefinement::default(); @@ -32,7 +32,7 @@ where render_items: Box::new(move |view, visible_range, cx| { f(view, visible_range, cx) .into_iter() - .map(|component| component.render()) + .map(|component| component.into_any()) .collect() }), interactivity: Interactivity { @@ -252,6 +252,14 @@ impl Element for UniformList { } } +impl RenderOnce for UniformList { + type Element = Self; + + fn render_once(self) -> Self::Element { + self + } +} + impl UniformList { pub fn with_width_from_item(mut self, item_index: Option) -> Self { self.item_to_measure_index = item_index.unwrap_or(0); @@ -286,14 +294,8 @@ impl UniformList { } } -impl InteractiveComponent for UniformList { +impl InteractiveElement for UniformList { fn interactivity(&mut self) -> &mut crate::Interactivity { &mut self.interactivity } } - -impl Component for UniformList { - fn render(self) -> AnyElement { - AnyElement::new(self) - } -} diff --git a/crates/gpui2/src/gpui2.rs b/crates/gpui2/src/gpui2.rs index 4423986e3d..a815c1f596 100644 --- a/crates/gpui2/src/gpui2.rs +++ b/crates/gpui2/src/gpui2.rs @@ -121,7 +121,7 @@ pub trait VisualContext: Context { build_view: impl FnOnce(&mut ViewContext<'_, V>) -> V, ) -> Self::Result> where - V: 'static + Render; + V: 'static + Render; fn update_view( &mut self, @@ -134,7 +134,7 @@ pub trait VisualContext: Context { build_view: impl FnOnce(&mut ViewContext<'_, V>) -> V, ) -> Self::Result> where - V: Render; + V: 'static + Render; fn focus_view(&mut self, view: &View) -> Self::Result<()> where diff --git a/crates/gpui2/src/interactive.rs b/crates/gpui2/src/interactive.rs index 83bcc5c8c5..617972e3c0 100644 --- a/crates/gpui2/src/interactive.rs +++ b/crates/gpui2/src/interactive.rs @@ -1,5 +1,5 @@ use crate::{ - div, point, Component, Div, FocusHandle, Keystroke, Modifiers, Pixels, Point, Render, + div, point, Div, Element, FocusHandle, Keystroke, Modifiers, Pixels, Point, Render, ViewContext, }; use smallvec::SmallVec; @@ -64,7 +64,7 @@ pub struct Drag where R: Fn(&mut V, &mut ViewContext) -> E, V: 'static, - E: Component<()>, + E: Element<()>, { pub state: S, pub render_drag_handle: R, @@ -75,7 +75,7 @@ impl Drag where R: Fn(&mut V, &mut ViewContext) -> E, V: 'static, - E: Component<()>, + E: Element<()>, { pub fn new(state: S, render_drag_handle: R) -> Self { Drag { @@ -193,7 +193,7 @@ impl Deref for MouseExitEvent { #[derive(Debug, Clone, Default)] pub struct ExternalPaths(pub(crate) SmallVec<[PathBuf; 2]>); -impl Render for ExternalPaths { +impl Render for ExternalPaths { type Element = Div; fn render(&mut self, _: &mut ViewContext) -> Self::Element { @@ -286,8 +286,8 @@ pub struct FocusEvent { #[cfg(test)] mod test { use crate::{ - self as gpui, div, Component, Div, FocusHandle, InteractiveComponent, KeyBinding, - Keystroke, ParentComponent, Render, Stateful, TestAppContext, ViewContext, VisualContext, + self as gpui, div, Div, FocusHandle, InteractiveElement, KeyBinding, Keystroke, + ParentElement, Stateful, TestAppContext, Render, VisualContext, }; struct TestView { @@ -298,7 +298,7 @@ mod test { actions!(TestAction); - impl Render for TestView { + impl Render for TestView { type Element = Stateful>; fn render(&mut self, _: &mut gpui::ViewContext) -> Self::Element { diff --git a/crates/gpui2/src/prelude.rs b/crates/gpui2/src/prelude.rs index 7c2ad3f07f..50f48596bc 100644 --- a/crates/gpui2/src/prelude.rs +++ b/crates/gpui2/src/prelude.rs @@ -1,4 +1,5 @@ pub use crate::{ - BorrowAppContext, BorrowWindow, Component, Context, FocusableComponent, InteractiveComponent, - ParentComponent, Refineable, Render, StatefulInteractiveComponent, Styled, VisualContext, + BorrowAppContext, BorrowWindow, Component, Context, Element, FocusableElement, + InteractiveElement, ParentElement, Refineable, Render, RenderOnce, StatefulInteractiveElement, + Styled, VisualContext, }; diff --git a/crates/gpui2/src/view.rs b/crates/gpui2/src/view.rs index 51675e814c..c32bc70e4a 100644 --- a/crates/gpui2/src/view.rs +++ b/crates/gpui2/src/view.rs @@ -1,7 +1,8 @@ use crate::{ private::Sealed, AnyElement, AnyModel, AnyWeakModel, AppContext, AvailableSpace, BorrowWindow, - Bounds, Component, Element, ElementId, Entity, EntityId, Flatten, FocusHandle, FocusableView, - LayoutId, Model, Pixels, Point, Size, ViewContext, VisualContext, WeakModel, WindowContext, + Bounds, Element, ElementId, Entity, EntityId, Flatten, FocusHandle, FocusableView, LayoutId, + Model, Pixels, Point, Render, RenderOnce, Size, ViewContext, VisualContext, WeakModel, + WindowContext, }; use anyhow::{Context, Result}; use std::{ @@ -9,14 +10,8 @@ use std::{ hash::{Hash, Hasher}, }; -pub trait Render: 'static + Sized { - type Element: Element + 'static; - - fn render(&mut self, cx: &mut ViewContext) -> Self::Element; -} - pub struct View { - pub(crate) model: Model, + pub model: Model, } impl Sealed for View {} @@ -64,13 +59,13 @@ impl View { self.model.read(cx) } - pub fn render_with(&self, component: C) -> RenderViewWith + pub fn render_with(&self, component: E) -> RenderViewWith where - C: 'static + Component, + E: 'static + Element, { RenderViewWith { view: self.clone(), - component: Some(component), + element: Some(component), } } @@ -104,12 +99,6 @@ impl PartialEq for View { impl Eq for View {} -impl Component for View { - fn render(self) -> AnyElement { - AnyElement::new(AnyView::from(self)) - } -} - pub struct WeakView { pub(crate) model: WeakModel, } @@ -206,13 +195,7 @@ impl AnyView { } } -impl Component for AnyView { - fn render(self) -> AnyElement { - AnyElement::new(self) - } -} - -impl From> for AnyView { +impl> From> for AnyView { fn from(value: View) -> Self { AnyView { model: value.model.into_any(), @@ -222,7 +205,48 @@ impl From> for AnyView { } } -impl Element for AnyView { +impl, ParentV: 'static> Element for View { + type State = Option>; + + fn element_id(&self) -> Option { + Some(self.model.entity_id.into()) + } + + fn layout( + &mut self, + _parent_view: &mut ParentV, + _state: Option, + cx: &mut ViewContext, + ) -> (LayoutId, Self::State) { + self.update(cx, |view, cx| { + let mut element = view.render(cx).into_any(); + let layout_id = element.layout(view, cx); + (layout_id, Some(element)) + }) + } + + fn paint( + self, + _: Bounds, + _parent: &mut ParentV, + element: &mut Self::State, + cx: &mut ViewContext, + ) { + self.update(cx, |view, cx| { + element.take().unwrap().paint(view, cx); + }); + } +} + +impl, ParentV: 'static> RenderOnce for View { + type Element = View; + + fn render_once(self) -> Self::Element { + self + } +} + +impl Element for AnyView { type State = Option>; fn element_id(&self) -> Option { @@ -231,9 +255,9 @@ impl Element for AnyView { fn layout( &mut self, - _view_state: &mut ParentViewState, + _view_state: &mut V, _element_state: Option, - cx: &mut ViewContext, + cx: &mut ViewContext, ) -> (LayoutId, Self::State) { let (layout_id, rendered_element) = (self.layout)(self, cx); (layout_id, Some(rendered_element)) @@ -242,14 +266,22 @@ impl Element for AnyView { fn paint( mut self, _bounds: Bounds, - _view_state: &mut ParentViewState, + _view_state: &mut V, rendered_element: &mut Self::State, - cx: &mut ViewContext, + cx: &mut ViewContext, ) { (self.paint)(&mut self, rendered_element.take().unwrap(), cx) } } +impl RenderOnce for AnyView { + type Element = Self; + + fn render_once(self) -> Self::Element { + self + } +} + pub struct AnyWeakView { model: AnyWeakModel, layout: fn(&AnyView, &mut WindowContext) -> (LayoutId, Box), @@ -267,7 +299,7 @@ impl AnyWeakView { } } -impl From> for AnyWeakView { +impl> From> for AnyWeakView { fn from(view: WeakView) -> Self { Self { model: view.model.into(), @@ -277,10 +309,10 @@ impl From> for AnyWeakView { } } -impl Render for T +impl Render for F where - T: 'static + FnMut(&mut WindowContext) -> E, - E: 'static + Send + Element, + F: 'static + FnMut(&mut WindowContext) -> E, + E: 'static + Send + Element, { type Element = E; @@ -289,29 +321,18 @@ where } } -pub struct RenderViewWith { +pub struct RenderViewWith { view: View, - component: Option, + element: Option, } -impl Component for RenderViewWith +impl Element for RenderViewWith where - C: 'static + Component, - ParentViewState: 'static, - ViewState: 'static, + E: 'static + Element, + ParentV: 'static, + V: 'static, { - fn render(self) -> AnyElement { - AnyElement::new(self) - } -} - -impl Element for RenderViewWith -where - C: 'static + Component, - ParentViewState: 'static, - ViewState: 'static, -{ - type State = Option>; + type State = Option>; fn element_id(&self) -> Option { Some(self.view.entity_id().into()) @@ -319,12 +340,12 @@ where fn layout( &mut self, - _: &mut ParentViewState, + _: &mut ParentV, _: Option, - cx: &mut ViewContext, + cx: &mut ViewContext, ) -> (LayoutId, Self::State) { self.view.update(cx, |view, cx| { - let mut element = self.component.take().unwrap().render(); + let mut element = self.element.take().unwrap().into_any(); let layout_id = element.layout(view, cx); (layout_id, Some(element)) }) @@ -333,20 +354,33 @@ where fn paint( self, _: Bounds, - _: &mut ParentViewState, + _: &mut ParentV, element: &mut Self::State, - cx: &mut ViewContext, + cx: &mut ViewContext, ) { self.view .update(cx, |view, cx| element.take().unwrap().paint(view, cx)) } } +impl RenderOnce for RenderViewWith +where + E: 'static + Element, + V: 'static, + ParentV: 'static, +{ + type Element = Self; + + fn render_once(self) -> Self::Element { + self + } +} + mod any_view { use crate::{AnyElement, AnyView, BorrowWindow, LayoutId, Render, WindowContext}; use std::any::Any; - pub(crate) fn layout( + pub(crate) fn layout>( view: &AnyView, cx: &mut WindowContext, ) -> (LayoutId, Box) { @@ -360,7 +394,11 @@ mod any_view { }) } - pub(crate) fn paint(view: &AnyView, element: Box, cx: &mut WindowContext) { + pub(crate) fn paint>( + view: &AnyView, + element: Box, + cx: &mut WindowContext, + ) { cx.with_element_id(Some(view.model.entity_id), |cx| { let view = view.clone().downcast::().unwrap(); let element = element.downcast::>().unwrap(); diff --git a/crates/gpui2/src/window.rs b/crates/gpui2/src/window.rs index a9a2c60acb..1b3b37c290 100644 --- a/crates/gpui2/src/window.rs +++ b/crates/gpui2/src/window.rs @@ -6,8 +6,8 @@ use crate::{ InputEvent, IsZero, KeyBinding, KeyContext, KeyDownEvent, LayoutId, Model, ModelContext, Modifiers, MonochromeSprite, MouseButton, MouseDownEvent, MouseMoveEvent, MouseUpEvent, Path, Pixels, PlatformAtlas, PlatformDisplay, PlatformInputHandler, PlatformWindow, Point, - PolychromeSprite, PromptLevel, Quad, Render, RenderGlyphParams, RenderImageParams, - RenderSvgParams, ScaledPixels, SceneBuilder, Shadow, SharedString, Size, Style, SubscriberSet, + PolychromeSprite, PromptLevel, Quad, RenderGlyphParams, RenderImageParams, RenderSvgParams, + Render, ScaledPixels, SceneBuilder, Shadow, SharedString, Size, Style, SubscriberSet, Subscription, TaffyLayoutEngine, Task, Underline, UnderlineStyle, View, VisualContext, WeakView, WindowBounds, WindowOptions, SUBPIXEL_VARIANTS, }; @@ -187,13 +187,13 @@ impl Drop for FocusHandle { /// FocusableView allows users of your view to easily /// focus it (using cx.focus_view(view)) -pub trait FocusableView: Render { +pub trait FocusableView: 'static + Render { fn focus_handle(&self, cx: &AppContext) -> FocusHandle; } /// ManagedView is a view (like a Modal, Popover, Menu, etc.) /// where the lifecycle of the view is handled by another view. -pub trait ManagedView: Render { +pub trait ManagedView: 'static + Render { fn focus_handle(&self, cx: &AppContext) -> FocusHandle; } @@ -1525,7 +1525,7 @@ impl VisualContext for WindowContext<'_> { build_view_state: impl FnOnce(&mut ViewContext<'_, V>) -> V, ) -> Self::Result> where - V: 'static + Render, + V: 'static + Render, { let slot = self.app.entities.reserve(); let view = View { @@ -1564,7 +1564,7 @@ impl VisualContext for WindowContext<'_> { build_view: impl FnOnce(&mut ViewContext<'_, V>) -> V, ) -> Self::Result> where - V: Render, + V: 'static + Render, { let slot = self.app.entities.reserve(); let view = View { @@ -2326,7 +2326,7 @@ impl Context for ViewContext<'_, V> { } impl VisualContext for ViewContext<'_, V> { - fn build_view( + fn build_view + 'static>( &mut self, build_view_state: impl FnOnce(&mut ViewContext<'_, W>) -> W, ) -> Self::Result> { @@ -2346,7 +2346,7 @@ impl VisualContext for ViewContext<'_, V> { build_view: impl FnOnce(&mut ViewContext<'_, W>) -> W, ) -> Self::Result> where - W: Render, + W: 'static + Render, { self.window_cx.replace_root_view(build_view) } @@ -2387,7 +2387,7 @@ pub struct WindowHandle { state_type: PhantomData, } -impl WindowHandle { +impl> WindowHandle { pub fn new(id: WindowId) -> Self { WindowHandle { any_handle: AnyWindowHandle { diff --git a/crates/gpui2_macros/src/derive_element.rs b/crates/gpui2_macros/src/derive_element.rs deleted file mode 100644 index e8c698c1fe..0000000000 --- a/crates/gpui2_macros/src/derive_element.rs +++ /dev/null @@ -1,75 +0,0 @@ -use proc_macro::TokenStream; -use quote::quote; -use syn::{parse_macro_input, DeriveInput, GenericParam}; - -pub fn derive_element(input: TokenStream) -> TokenStream { - let ast = parse_macro_input!(input as DeriveInput); - let type_name = ast.ident; - - let mut view_state_ty = quote! { V }; - - for param in &ast.generics.params { - if let GenericParam::Type(type_param) = param { - let type_ident = &type_param.ident; - view_state_ty = quote! {#type_ident}; - break; - } - } - - let attrs = &ast.attrs; - for attr in attrs { - if attr.path.is_ident("element") { - match attr.parse_meta() { - Ok(syn::Meta::List(i)) => { - for nested_meta in i.nested { - if let syn::NestedMeta::Meta(syn::Meta::NameValue(nv)) = nested_meta { - if nv.path.is_ident("view_state") { - if let syn::Lit::Str(lit_str) = nv.lit { - view_state_ty = lit_str.value().parse().unwrap(); - } - } - } - } - } - _ => (), - } - } - } - - let (impl_generics, ty_generics, where_clause) = ast.generics.split_for_impl(); - - let gen = quote! { - impl #impl_generics gpui::Element<#view_state_ty> for #type_name #ty_generics - #where_clause - { - type State = Option>; - - fn element_id(&self) -> Option { - None - } - - fn layout( - &mut self, - view_state: &mut #view_state_ty, - _element_state: Option, - cx: &mut gpui::ViewContext<#view_state_ty>, - ) -> (gpui::LayoutId, Self::State) { - let mut element = self.render(view_state, cx).into_any(); - let layout_id = element.layout(view_state, cx); - (layout_id, Some(element)) - } - - fn paint( - self, - _bounds: gpui::Bounds, - view_state: &mut #view_state_ty, - rendered_element: &mut Self::State, - cx: &mut gpui::ViewContext<#view_state_ty>, - ) { - rendered_element.take().unwrap().paint(view_state, cx) - } - } - }; - - gen.into() -} diff --git a/crates/gpui2_macros/src/derive_render_once.rs b/crates/gpui2_macros/src/derive_render_once.rs new file mode 100644 index 0000000000..ee01e22358 --- /dev/null +++ b/crates/gpui2_macros/src/derive_render_once.rs @@ -0,0 +1,64 @@ +use proc_macro::TokenStream; +use quote::quote; +use syn::{parse_macro_input, parse_quote, DeriveInput}; + +pub fn derive_render_once(input: TokenStream) -> TokenStream { + let ast = parse_macro_input!(input as DeriveInput); + let type_name = &ast.ident; + + let mut trait_generics = ast.generics.clone(); + let view_type = if let Some(view_type) = specified_view_type(&ast) { + quote! { #view_type } + } else { + if let Some(first_type_param) = ast.generics.params.iter().find_map(|param| { + if let syn::GenericParam::Type(type_param) = param { + Some(type_param.ident.clone()) + } else { + None + } + }) { + quote! { #first_type_param } + } else { + trait_generics.params.push(parse_quote! { V: 'static }); + quote! { V } + } + }; + + let (impl_generics, _, where_clause) = trait_generics.split_for_impl(); + let (_, type_generics, _) = ast.generics.split_for_impl(); + + let gen = quote! { + impl #impl_generics gpui::RenderOnce<#view_type> for #type_name #type_generics + #where_clause + { + type Element = gpui::CompositeElement<#view_type, Self>; + + fn render_once(self) -> Self::Element { + gpui::CompositeElement::new(self) + } + } + }; + + if type_name == "Avatar" { + println!("{gen}"); + } + + gen.into() +} + +fn specified_view_type(ast: &DeriveInput) -> Option { + ast.attrs.iter().find_map(|attr| { + if attr.path.is_ident("view") { + if let Ok(syn::Meta::NameValue(meta_name_value)) = attr.parse_meta() { + if let syn::Lit::Str(lit_str) = meta_name_value.lit { + return Some( + lit_str + .parse::() + .expect("Failed to parse view_type"), + ); + } + } + } + None + }) +} diff --git a/crates/gpui2_macros/src/gpui2_macros.rs b/crates/gpui2_macros/src/gpui2_macros.rs index a611727066..6dd817e280 100644 --- a/crates/gpui2_macros/src/gpui2_macros.rs +++ b/crates/gpui2_macros/src/gpui2_macros.rs @@ -1,6 +1,6 @@ mod action; mod derive_component; -mod derive_element; +mod derive_render_once; mod register_action; mod style_helpers; mod test; @@ -22,9 +22,9 @@ pub fn derive_component(input: TokenStream) -> TokenStream { derive_component::derive_component(input) } -#[proc_macro_derive(Element, attributes(element))] -pub fn derive_element(input: TokenStream) -> TokenStream { - derive_element::derive_element(input) +#[proc_macro_derive(RenderOnce, attributes(view))] +pub fn derive_render_once(input: TokenStream) -> TokenStream { + derive_render_once::derive_render_once(input) } #[proc_macro] diff --git a/crates/project_panel2/src/project_panel.rs b/crates/project_panel2/src/project_panel.rs index 7a455fe8ce..46ad7a7a41 100644 --- a/crates/project_panel2/src/project_panel.rs +++ b/crates/project_panel2/src/project_panel.rs @@ -10,9 +10,9 @@ use anyhow::{anyhow, Result}; use gpui::{ actions, div, px, uniform_list, Action, AppContext, AssetSource, AsyncWindowContext, ClipboardItem, Component, Div, EventEmitter, FocusHandle, Focusable, FocusableView, - InteractiveComponent, Model, MouseButton, ParentComponent, Pixels, Point, PromptLevel, Render, - Stateful, StatefulInteractiveComponent, Styled, Task, UniformListScrollHandle, View, - ViewContext, VisualContext as _, WeakView, WindowContext, + InteractiveElement, Model, MouseButton, ParentElement, Pixels, Point, PromptLevel, Render, + Stateful, StatefulInteractiveElement, Styled, Task, UniformListScrollHandle, View, ViewContext, + VisualContext as _, WeakView, WindowContext, }; use menu::{Confirm, SelectNext, SelectPrev}; use project::{ diff --git a/crates/storybook2/src/stories/text.rs b/crates/storybook2/src/stories/text.rs index 6fc76ab907..94c9d0d51f 100644 --- a/crates/storybook2/src/stories/text.rs +++ b/crates/storybook2/src/stories/text.rs @@ -1,4 +1,6 @@ -use gpui::{div, white, Div, ParentComponent, Render, Styled, View, VisualContext, WindowContext}; +use gpui::{ + div, white, Div, ParentElement, Render, Styled, View, VisualContext, WindowContext, +}; pub struct TextStory; diff --git a/crates/storybook2/src/stories/z_index.rs b/crates/storybook2/src/stories/z_index.rs index 02165db0cd..4916f192b1 100644 --- a/crates/storybook2/src/stories/z_index.rs +++ b/crates/storybook2/src/stories/z_index.rs @@ -79,7 +79,7 @@ trait Styles: Styled + Sized { impl Styles for Div {} -#[derive(Component)] +// #[derive(RenderOnce)] struct ZIndexExample { z_index: u32, } diff --git a/crates/terminal_view2/src/terminal_panel.rs b/crates/terminal_view2/src/terminal_panel.rs index 944cd912be..6321e61e35 100644 --- a/crates/terminal_view2/src/terminal_panel.rs +++ b/crates/terminal_view2/src/terminal_panel.rs @@ -4,7 +4,7 @@ use crate::TerminalView; use db::kvp::KEY_VALUE_STORE; use gpui::{ actions, div, serde_json, AppContext, AsyncWindowContext, Div, Entity, EventEmitter, - FocusHandle, FocusableView, ParentComponent, Render, Subscription, Task, View, ViewContext, + FocusHandle, FocusableView, ParentElement, Render, Subscription, Task, View, ViewContext, VisualContext, WeakView, WindowContext, }; use project::Fs; diff --git a/crates/terminal_view2/src/terminal_view.rs b/crates/terminal_view2/src/terminal_view.rs index b6ab7e86b9..8f5aeb5630 100644 --- a/crates/terminal_view2/src/terminal_view.rs +++ b/crates/terminal_view2/src/terminal_view.rs @@ -10,10 +10,9 @@ pub mod terminal_panel; use editor::{scroll::autoscroll::Autoscroll, Editor}; use gpui::{ actions, div, img, red, Action, AnyElement, AppContext, Component, DispatchPhase, Div, - EventEmitter, FocusEvent, FocusHandle, Focusable, FocusableComponent, FocusableView, - InputHandler, InteractiveComponent, KeyDownEvent, Keystroke, Model, MouseButton, - ParentComponent, Pixels, Render, SharedString, Styled, Task, View, ViewContext, VisualContext, - WeakView, + EventEmitter, FocusEvent, FocusHandle, Focusable, FocusableElement, FocusableView, + InputHandler, InteractiveElement, KeyDownEvent, Keystroke, Model, MouseButton, ParentElement, + Pixels, Render, SharedString, Styled, Task, View, ViewContext, VisualContext, WeakView, }; use language::Bias; use persistence::TERMINAL_DB; diff --git a/crates/theme2/src/story.rs b/crates/theme2/src/story.rs index 9cf78cf943..e0c802fcc7 100644 --- a/crates/theme2/src/story.rs +++ b/crates/theme2/src/story.rs @@ -1,4 +1,4 @@ -use gpui::{div, Component, Div, Element, ParentComponent, SharedString, Styled, ViewContext}; +use gpui::{div, Div, Element, ParentElement, SharedString, Styled, ViewContext}; use crate::ActiveTheme; diff --git a/crates/theme2/src/styles/players.rs b/crates/theme2/src/styles/players.rs index dfb0a6ff4e..2eba4e8275 100644 --- a/crates/theme2/src/styles/players.rs +++ b/crates/theme2/src/styles/players.rs @@ -143,11 +143,11 @@ use crate::{amber, blue, jade, lime, orange, pink, purple, red}; mod stories { use super::*; use crate::{ActiveTheme, Story}; - use gpui::{div, img, px, Div, ParentComponent, Render, Styled, ViewContext}; + use gpui::{div, img, px, Div, ParentElement, Render, Styled, ViewContext}; pub struct PlayerStory; - impl Render for PlayerStory { + impl Render for PlayerStory { type Element = Div; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { diff --git a/crates/ui2/src/components/avatar.rs b/crates/ui2/src/components/avatar.rs index 95e0653d36..da76a95cfa 100644 --- a/crates/ui2/src/components/avatar.rs +++ b/crates/ui2/src/components/avatar.rs @@ -1,26 +1,16 @@ use crate::prelude::*; -use gpui::img; +use gpui::{img, Img, RenderOnce}; -#[derive(Element)] +#[derive(RenderOnce)] pub struct Avatar { src: SharedString, shape: Shape, } -impl Avatar { - pub fn new(src: impl Into) -> Self { - Self { - src: src.into(), - shape: Shape::Circle, - } - } +impl Component for Avatar { + type Rendered = Img; - pub fn shape(mut self, shape: Shape) -> Self { - self.shape = shape; - self - } - - fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Element { + fn render(self, _view: &mut V, cx: &mut ViewContext) -> Self::Rendered { let mut img = img(); if self.shape == Shape::Circle { @@ -36,6 +26,20 @@ impl Avatar { } } +impl Avatar { + pub fn new(src: impl Into) -> Self { + Self { + src: src.into(), + shape: Shape::Circle, + } + } + + pub fn shape(mut self, shape: Shape) -> Self { + self.shape = shape; + self + } +} + #[cfg(feature = "stories")] pub use stories::*; @@ -47,7 +51,7 @@ mod stories { pub struct AvatarStory; - impl Render for AvatarStory { + impl Render for AvatarStory { type Element = Div; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { diff --git a/crates/ui2/src/components/button.rs b/crates/ui2/src/components/button.rs index b2c6893793..f22727ae64 100644 --- a/crates/ui2/src/components/button.rs +++ b/crates/ui2/src/components/button.rs @@ -1,6 +1,9 @@ use std::sync::Arc; -use gpui::{div, DefiniteLength, Hsla, MouseButton, StatefulInteractiveComponent, WindowContext}; +use gpui::{ + div, DefiniteLength, Div, Hsla, MouseButton, RenderOnce, Stateful, StatefulInteractiveElement, + WindowContext, +}; use crate::prelude::*; use crate::{h_stack, Icon, IconButton, IconElement, Label, LineHeightStyle, TextColor}; @@ -76,7 +79,7 @@ impl Default for ButtonHandlers { } } -#[derive(Component)] +#[derive(RenderOnce)] pub struct Button { disabled: bool, handlers: ButtonHandlers, @@ -88,6 +91,58 @@ pub struct Button { color: Option, } +impl Component for Button { + type Rendered = Stateful>; + + fn render(self, view: &mut V, cx: &mut ViewContext) -> Self::Rendered { + let _view: &mut V = view; + let (icon_color, label_color) = match (self.disabled, self.color) { + (true, _) => (TextColor::Disabled, TextColor::Disabled), + (_, None) => (TextColor::Default, TextColor::Default), + (_, Some(color)) => (TextColor::from(color), color), + }; + + let mut button = h_stack() + .id(SharedString::from(format!("{}", self.label))) + .relative() + .p_1() + .text_ui() + .rounded_md() + .bg(self.variant.bg_color(cx)) + .cursor_pointer() + .hover(|style| style.bg(self.variant.bg_color_hover(cx))) + .active(|style| style.bg(self.variant.bg_color_active(cx))); + + match (self.icon, self.icon_position) { + (Some(_), Some(IconPosition::Left)) => { + button = button + .gap_1() + .child(self.render_label(label_color)) + .children(self.render_icon(icon_color)) + } + (Some(_), Some(IconPosition::Right)) => { + button = button + .gap_1() + .children(self.render_icon(icon_color)) + .child(self.render_label(label_color)) + } + (_, _) => button = button.child(self.render_label(label_color)), + } + + if let Some(width) = self.width { + button = button.w(width).justify_center(); + } + + if let Some(click_handler) = self.handlers.click.clone() { + button = button.on_mouse_down(MouseButton::Left, move |state, event, cx| { + click_handler(state, cx); + }); + } + + button + } +} + impl Button { pub fn new(label: impl Into) -> Self { Self { @@ -212,25 +267,29 @@ impl Button { } } -#[derive(Component)] +#[derive(RenderOnce)] pub struct ButtonGroup { buttons: Vec>, } +impl Component for ButtonGroup { + type Rendered = Div; + + fn render(self, view: &mut V, cx: &mut ViewContext) -> Self::Rendered { + let mut group = h_stack(); + + for button in self.buttons.into_iter() { + group = group.child(button.render(view, cx)); + } + + group + } +} + impl ButtonGroup { pub fn new(buttons: Vec>) -> Self { Self { buttons } } - - fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Element { - let mut el = h_stack().text_ui(); - - for button in self.buttons { - el = el.child(button.render(_view, cx)); - } - - el - } } #[cfg(feature = "stories")] @@ -245,7 +304,7 @@ mod stories { pub struct ButtonStory; - impl Render for ButtonStory { + impl Render for ButtonStory { type Element = Div; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { diff --git a/crates/ui2/src/components/checkbox.rs b/crates/ui2/src/components/checkbox.rs index 0b3141a9f3..3e1d4ff669 100644 --- a/crates/ui2/src/components/checkbox.rs +++ b/crates/ui2/src/components/checkbox.rs @@ -1,4 +1,4 @@ -use gpui::{div, prelude::*, Component, Element, ElementId, Styled, ViewContext}; +use gpui::{div, prelude::*, Div, Element, ElementId, RenderOnce, Stateful, Styled, ViewContext}; use std::sync::Arc; use theme2::ActiveTheme; @@ -11,7 +11,7 @@ pub type CheckHandler = Arc) + /// Checkboxes are used for multiple choices, not for mutually exclusive choices. /// Each checkbox works independently from other checkboxes in the list, /// therefore checking an additional box does not affect any other selections. -#[derive(Component)] +#[derive(RenderOnce)] pub struct Checkbox { id: ElementId, checked: Selection, @@ -19,6 +19,130 @@ pub struct Checkbox { on_click: Option>, } +impl Component for Checkbox { + type Rendered = Stateful>; + + fn render(self, view: &mut V, cx: &mut ViewContext) -> Self::Rendered { + let group_id = format!("checkbox_group_{:?}", self.id); + + let icon = match self.checked { + // When selected, we show a checkmark. + Selection::Selected => { + Some( + IconElement::new(Icon::Check) + .size(crate::IconSize::Small) + .color( + // If the checkbox is disabled we change the color of the icon. + if self.disabled { + TextColor::Disabled + } else { + TextColor::Selected + }, + ), + ) + } + // In an indeterminate state, we show a dash. + Selection::Indeterminate => { + Some( + IconElement::new(Icon::Dash) + .size(crate::IconSize::Small) + .color( + // If the checkbox is disabled we change the color of the icon. + if self.disabled { + TextColor::Disabled + } else { + TextColor::Selected + }, + ), + ) + } + // When unselected, we show nothing. + Selection::Unselected => None, + }; + + // A checkbox could be in an indeterminate state, + // for example the indeterminate state could represent: + // - a group of options of which only some are selected + // - an enabled option that is no longer available + // - a previously agreed to license that has been updated + // + // For the sake of styles we treat the indeterminate state as selected, + // but it's icon will be different. + let selected = + self.checked == Selection::Selected || self.checked == Selection::Indeterminate; + + // We could use something like this to make the checkbox background when selected: + // + // ~~~rust + // ... + // .when(selected, |this| { + // this.bg(cx.theme().colors().element_selected) + // }) + // ~~~ + // + // But we use a match instead here because the checkbox might be disabled, + // and it could be disabled _while_ it is selected, as well as while it is not selected. + let (bg_color, border_color) = match (self.disabled, selected) { + (true, _) => ( + cx.theme().colors().ghost_element_disabled, + cx.theme().colors().border_disabled, + ), + (false, true) => ( + cx.theme().colors().element_selected, + cx.theme().colors().border, + ), + (false, false) => ( + cx.theme().colors().element_background, + cx.theme().colors().border, + ), + }; + + div() + .id(self.id) + // Rather than adding `px_1()` to add some space around the checkbox, + // we use a larger parent element to create a slightly larger + // click area for the checkbox. + .size_5() + // Because we've enlarged the click area, we need to create a + // `group` to pass down interactivity events to the checkbox. + .group(group_id.clone()) + .child( + div() + .flex() + // This prevent the flex element from growing + // or shrinking in response to any size changes + .flex_none() + // The combo of `justify_center()` and `items_center()` + // is used frequently to center elements in a flex container. + // + // We use this to center the icon in the checkbox. + .justify_center() + .items_center() + .m_1() + .size_4() + .rounded_sm() + .bg(bg_color) + .border() + .border_color(border_color) + // We only want the interactivity states to fire when we + // are in a checkbox that isn't disabled. + .when(!self.disabled, |this| { + // Here instead of `hover()` we use `group_hover()` + // to pass it the group id. + this.group_hover(group_id.clone(), |el| { + el.bg(cx.theme().colors().element_hover) + }) + }) + .children(icon), + ) + .when_some( + self.on_click.filter(|_| !self.disabled), + |this, on_click| { + this.on_click(move |view, _, cx| on_click(self.checked.inverse(), view, cx)) + }, + ) + } +} impl Checkbox { pub fn new(id: impl Into, checked: Selection) -> Self { Self { @@ -175,7 +299,7 @@ mod stories { pub struct CheckboxStory; - impl Render for CheckboxStory { + impl Render for CheckboxStory { type Element = Div; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { diff --git a/crates/ui2/src/components/context_menu.rs b/crates/ui2/src/components/context_menu.rs index c6d2382f56..41675e6bcd 100644 --- a/crates/ui2/src/components/context_menu.rs +++ b/crates/ui2/src/components/context_menu.rs @@ -5,7 +5,8 @@ use crate::prelude::*; use crate::{v_stack, Label, List, ListEntry, ListItem, ListSeparator, ListSubHeader}; use gpui::{ overlay, px, Action, AnchorCorner, AnyElement, Bounds, Dismiss, DispatchPhase, Div, - FocusHandle, LayoutId, ManagedView, MouseButton, MouseDownEvent, Pixels, Point, Render, View, + FocusHandle, LayoutId, ManagedView, MouseButton, MouseDownEvent, Pixels, Point, Render, + RenderOnce, View, }; pub struct ContextMenu { @@ -52,7 +53,7 @@ impl ContextMenu { } } -impl Render for ContextMenu { +impl Render for ContextMenu { type Element = Div; // todo!() fn render(&mut self, cx: &mut ViewContext) -> Self::Element { @@ -96,8 +97,8 @@ impl MenuHandle { self } - pub fn child>(mut self, f: impl FnOnce(bool) -> R + 'static) -> Self { - self.child_builder = Some(Box::new(|b| f(b).render())); + pub fn child>(mut self, f: impl FnOnce(bool) -> R + 'static) -> Self { + self.child_builder = Some(Box::new(|b| f(b).render_once().into_any())); self } @@ -160,9 +161,9 @@ impl Element for MenuHandle { } overlay = overlay.position(*position.borrow()); - let mut view = overlay.child(menu.clone()).render(); - menu_layout_id = Some(view.layout(view_state, cx)); - view + let mut element = overlay.child(menu.clone()).into_any(); + menu_layout_id = Some(element.layout(view_state, cx)); + element }); let mut child_element = self @@ -247,9 +248,11 @@ impl Element for MenuHandle { } } -impl Component for MenuHandle { - fn render(self) -> AnyElement { - AnyElement::new(self) +impl RenderOnce for MenuHandle { + type Element = Self; + + fn render_once(self) -> Self::Element { + self } } @@ -275,7 +278,7 @@ mod stories { pub struct ContextMenuStory; - impl Render for ContextMenuStory { + impl Render for ContextMenuStory { type Element = Div; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { @@ -302,7 +305,6 @@ mod stories { } else { "RIGHT CLICK ME" }) - .render() }) .menu(move |_, cx| build_menu(cx, "top left")), ) @@ -315,7 +317,6 @@ mod stories { } else { "RIGHT CLICK ME" }) - .render() }) .anchor(AnchorCorner::BottomLeft) .attach(AnchorCorner::TopLeft) @@ -336,7 +337,6 @@ mod stories { } else { "RIGHT CLICK ME" }) - .render() }) .anchor(AnchorCorner::TopRight) .menu(move |_, cx| build_menu(cx, "top right")), @@ -350,7 +350,6 @@ mod stories { } else { "RIGHT CLICK ME" }) - .render() }) .anchor(AnchorCorner::BottomRight) .attach(AnchorCorner::TopRight) diff --git a/crates/ui2/src/components/details.rs b/crates/ui2/src/components/details.rs index 41b3e45a95..95750d5b47 100644 --- a/crates/ui2/src/components/details.rs +++ b/crates/ui2/src/components/details.rs @@ -1,13 +1,29 @@ use crate::prelude::*; use crate::{v_stack, ButtonGroup}; -#[derive(Component)] +#[derive(RenderOnce)] pub struct Details { text: &'static str, meta: Option<&'static str>, actions: Option>, } +impl Component for Details { + type Rendered = Div; + + fn render(self, view: &mut V, cx: &mut ViewContext) -> Self::Rendered { + v_stack() + .p_1() + .gap_0p5() + .text_ui_sm() + .text_color(cx.theme().colors().text) + .size_full() + .child(self.text) + .children(self.meta.map(|m| m)) + .children(self.actions.map(|a| a)) + } +} + impl Details { pub fn new(text: &'static str) -> Self { Self { @@ -26,20 +42,9 @@ impl Details { self.actions = Some(actions); self } - - fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Element { - v_stack() - .p_1() - .gap_0p5() - .text_ui_sm() - .text_color(cx.theme().colors().text) - .size_full() - .child(self.text) - .children(self.meta.map(|m| m)) - .children(self.actions.map(|a| a)) - } } +use gpui::{Div, RenderOnce}; #[cfg(feature = "stories")] pub use stories::*; @@ -51,7 +56,7 @@ mod stories { pub struct DetailsStory; - impl Render for DetailsStory { + impl Render for DetailsStory { type Element = Div; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { diff --git a/crates/ui2/src/components/divider.rs b/crates/ui2/src/components/divider.rs index 7025a99a9f..a651ab08af 100644 --- a/crates/ui2/src/components/divider.rs +++ b/crates/ui2/src/components/divider.rs @@ -1,3 +1,5 @@ +use gpui::RenderOnce; + use crate::prelude::*; enum DividerDirection { @@ -5,7 +7,7 @@ enum DividerDirection { Vertical, } -#[derive(Component)] +// #[derive(RenderOnce)] pub struct Divider { direction: DividerDirection, inset: bool, diff --git a/crates/ui2/src/components/facepile.rs b/crates/ui2/src/components/facepile.rs index a3ec7db7b1..8bb3c9b2e0 100644 --- a/crates/ui2/src/components/facepile.rs +++ b/crates/ui2/src/components/facepile.rs @@ -1,19 +1,15 @@ use crate::prelude::*; use crate::{Avatar, Player}; -#[derive(Component)] +#[derive(RenderOnce)] pub struct Facepile { players: Vec, } -impl Facepile { - pub fn new>(players: P) -> Self { - Self { - players: players.collect(), - } - } +impl Component for Facepile { + type Rendered = Div; - fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Element { + fn render(self, view: &mut V, cx: &mut ViewContext) -> Self::Rendered { let player_count = self.players.len(); let player_list = self.players.iter().enumerate().map(|(ix, player)| { let isnt_last = ix < player_count - 1; @@ -26,6 +22,15 @@ impl Facepile { } } +impl Facepile { + pub fn new>(players: P) -> Self { + Self { + players: players.collect(), + } + } +} + +use gpui::{Div, RenderOnce}; #[cfg(feature = "stories")] pub use stories::*; @@ -37,7 +42,7 @@ mod stories { pub struct FacepileStory; - impl Render for FacepileStory { + impl Render for FacepileStory { type Element = Div; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { diff --git a/crates/ui2/src/components/icon.rs b/crates/ui2/src/components/icon.rs index 7dc9385a4f..0bf2828ad6 100644 --- a/crates/ui2/src/components/icon.rs +++ b/crates/ui2/src/components/icon.rs @@ -1,4 +1,4 @@ -use gpui::{rems, svg}; +use gpui::{rems, svg, RenderOnce, Svg}; use strum::EnumIter; use crate::prelude::*; @@ -129,13 +129,30 @@ impl Icon { } } -#[derive(Component)] +#[derive(RenderOnce)] pub struct IconElement { path: SharedString, color: TextColor, size: IconSize, } +impl Component for IconElement { + type Rendered = Svg; + + fn render(self, _view: &mut V, cx: &mut ViewContext) -> Self::Rendered { + let svg_size = match self.size { + IconSize::Small => rems(0.75), + IconSize::Medium => rems(0.9375), + }; + + svg() + .size(svg_size) + .flex_none() + .path(self.path) + .text_color(self.color.color(cx)) + } +} + impl IconElement { pub fn new(icon: Icon) -> Self { Self { @@ -191,7 +208,7 @@ mod stories { pub struct IconStory; - impl Render for IconStory { + impl Render for IconStory { type Element = Div; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { diff --git a/crates/ui2/src/components/icon_button.rs b/crates/ui2/src/components/icon_button.rs index 5bb26cdb91..ea015e95a6 100644 --- a/crates/ui2/src/components/icon_button.rs +++ b/crates/ui2/src/components/icon_button.rs @@ -1,5 +1,5 @@ use crate::{h_stack, prelude::*, ClickHandler, Icon, IconElement}; -use gpui::{prelude::*, Action, AnyView, MouseButton}; +use gpui::{prelude::*, Action, AnyView, Div, MouseButton, Stateful}; use std::sync::Arc; struct IconButtonHandlers { @@ -12,7 +12,7 @@ impl Default for IconButtonHandlers { } } -#[derive(Component)] +#[derive(RenderOnce)] pub struct IconButton { id: ElementId, icon: Icon, @@ -24,6 +24,61 @@ pub struct IconButton { handlers: IconButtonHandlers, } +impl Component for IconButton { + type Rendered = Stateful>; + + fn render(self, view: &mut V, cx: &mut ViewContext) -> Self::Rendered { + let icon_color = match (self.state, self.color) { + (InteractionState::Disabled, _) => TextColor::Disabled, + (InteractionState::Active, _) => TextColor::Selected, + _ => self.color, + }; + + let (mut bg_color, bg_hover_color, bg_active_color) = match self.variant { + ButtonVariant::Filled => ( + cx.theme().colors().element_background, + cx.theme().colors().element_hover, + cx.theme().colors().element_active, + ), + ButtonVariant::Ghost => ( + cx.theme().colors().ghost_element_background, + cx.theme().colors().ghost_element_hover, + cx.theme().colors().ghost_element_active, + ), + }; + + if self.selected { + bg_color = bg_hover_color; + } + + let mut button = h_stack() + .id(self.id.clone()) + .justify_center() + .rounded_md() + .p_1() + .bg(bg_color) + .cursor_pointer() + .hover(|style| style.bg(bg_hover_color)) + .active(|style| style.bg(bg_active_color)) + .child(IconElement::new(self.icon).color(icon_color)); + + if let Some(click_handler) = self.handlers.click.clone() { + button = button.on_mouse_down(MouseButton::Left, move |state, event, cx| { + cx.stop_propagation(); + click_handler(state, cx); + }) + } + + if let Some(tooltip) = self.tooltip { + if !self.selected { + button = button.tooltip(move |view: &mut V, cx| (tooltip)(view, cx)) + } + } + + button + } +} + impl IconButton { pub fn new(id: impl Into, icon: Icon) -> Self { Self { @@ -79,55 +134,4 @@ impl IconButton { pub fn action(self, action: Box) -> Self { self.on_click(move |this, cx| cx.dispatch_action(action.boxed_clone())) } - - fn render(mut self, _view: &mut V, cx: &mut ViewContext) -> impl Element { - let icon_color = match (self.state, self.color) { - (InteractionState::Disabled, _) => TextColor::Disabled, - (InteractionState::Active, _) => TextColor::Selected, - _ => self.color, - }; - - let (mut bg_color, bg_hover_color, bg_active_color) = match self.variant { - ButtonVariant::Filled => ( - cx.theme().colors().element_background, - cx.theme().colors().element_hover, - cx.theme().colors().element_active, - ), - ButtonVariant::Ghost => ( - cx.theme().colors().ghost_element_background, - cx.theme().colors().ghost_element_hover, - cx.theme().colors().ghost_element_active, - ), - }; - - if self.selected { - bg_color = bg_hover_color; - } - - let mut button = h_stack() - .id(self.id.clone()) - .justify_center() - .rounded_md() - .p_1() - .bg(bg_color) - .cursor_pointer() - .hover(|style| style.bg(bg_hover_color)) - .active(|style| style.bg(bg_active_color)) - .child(IconElement::new(self.icon).color(icon_color)); - - if let Some(click_handler) = self.handlers.click.clone() { - button = button.on_mouse_down(MouseButton::Left, move |state, event, cx| { - cx.stop_propagation(); - click_handler(state, cx); - }) - } - - if let Some(tooltip) = self.tooltip.take() { - if !self.selected { - button = button.tooltip(move |view: &mut V, cx| (tooltip)(view, cx)) - } - } - - button - } } diff --git a/crates/ui2/src/components/indicator.rs b/crates/ui2/src/components/indicator.rs index 02760852b1..33c0307cd4 100644 --- a/crates/ui2/src/components/indicator.rs +++ b/crates/ui2/src/components/indicator.rs @@ -1,10 +1,24 @@ -use gpui::px; - use crate::prelude::*; +use gpui::{px, Div, RenderOnce}; -#[derive(Component)] +#[derive(RenderOnce)] pub struct UnreadIndicator; +impl Component for UnreadIndicator { + type Rendered = Div; + + fn render(self, view: &mut V, cx: &mut ViewContext) -> Self::Rendered { + div() + .rounded_full() + .border_2() + .border_color(cx.theme().colors().surface_background) + .w(px(9.0)) + .h(px(9.0)) + .z_index(2) + .bg(cx.theme().status().info) + } +} + impl UnreadIndicator { pub fn new() -> Self { Self diff --git a/crates/ui2/src/components/input.rs b/crates/ui2/src/components/input.rs index 1389d83ce2..ea0312ab82 100644 --- a/crates/ui2/src/components/input.rs +++ b/crates/ui2/src/components/input.rs @@ -1,5 +1,5 @@ use crate::{prelude::*, Label}; -use gpui::prelude::*; +use gpui::{prelude::*, Div, RenderOnce, Stateful}; #[derive(Default, PartialEq)] pub enum InputVariant { @@ -8,7 +8,7 @@ pub enum InputVariant { Filled, } -#[derive(Component)] +#[derive(RenderOnce)] pub struct Input { placeholder: SharedString, value: String, @@ -18,6 +18,57 @@ pub struct Input { is_active: bool, } +impl Component for Input { + type Rendered = Stateful>; + + fn render(self, view: &mut V, cx: &mut ViewContext) -> Self::Rendered { + let (input_bg, input_hover_bg, input_active_bg) = match self.variant { + InputVariant::Ghost => ( + cx.theme().colors().ghost_element_background, + cx.theme().colors().ghost_element_hover, + cx.theme().colors().ghost_element_active, + ), + InputVariant::Filled => ( + cx.theme().colors().element_background, + cx.theme().colors().element_hover, + cx.theme().colors().element_active, + ), + }; + + let placeholder_label = Label::new(self.placeholder.clone()).color(if self.disabled { + TextColor::Disabled + } else { + TextColor::Placeholder + }); + + let label = Label::new(self.value.clone()).color(if self.disabled { + TextColor::Disabled + } else { + TextColor::Default + }); + + div() + .id("input") + .h_7() + .w_full() + .px_2() + .border() + .border_color(cx.theme().styles.system.transparent) + .bg(input_bg) + .hover(|style| style.bg(input_hover_bg)) + .active(|style| style.bg(input_active_bg)) + .flex() + .items_center() + .child(div().flex().items_center().text_ui_sm().map(move |this| { + if self.value.is_empty() { + this.child(placeholder_label) + } else { + this.child(label) + } + })) + } +} + impl Input { pub fn new(placeholder: impl Into) -> Self { Self { @@ -54,53 +105,6 @@ impl Input { self.is_active = is_active; self } - - fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Element { - let (input_bg, input_hover_bg, input_active_bg) = match self.variant { - InputVariant::Ghost => ( - cx.theme().colors().ghost_element_background, - cx.theme().colors().ghost_element_hover, - cx.theme().colors().ghost_element_active, - ), - InputVariant::Filled => ( - cx.theme().colors().element_background, - cx.theme().colors().element_hover, - cx.theme().colors().element_active, - ), - }; - - let placeholder_label = Label::new(self.placeholder.clone()).color(if self.disabled { - TextColor::Disabled - } else { - TextColor::Placeholder - }); - - let label = Label::new(self.value.clone()).color(if self.disabled { - TextColor::Disabled - } else { - TextColor::Default - }); - - div() - .id("input") - .h_7() - .w_full() - .px_2() - .border() - .border_color(cx.theme().styles.system.transparent) - .bg(input_bg) - .hover(|style| style.bg(input_hover_bg)) - .active(|style| style.bg(input_active_bg)) - .flex() - .items_center() - .child(div().flex().items_center().text_ui_sm().map(|this| { - if self.value.is_empty() { - this.child(placeholder_label) - } else { - this.child(label) - } - })) - } } #[cfg(feature = "stories")] @@ -114,7 +118,7 @@ mod stories { pub struct InputStory; - impl Render for InputStory { + impl Render for InputStory { type Element = Div; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { diff --git a/crates/ui2/src/components/keybinding.rs b/crates/ui2/src/components/keybinding.rs index 608e3ab0b8..ce7c408fb2 100644 --- a/crates/ui2/src/components/keybinding.rs +++ b/crates/ui2/src/components/keybinding.rs @@ -1,9 +1,8 @@ -use gpui::Action; +use crate::prelude::*; +use gpui::{Action, Div, RenderOnce}; use strum::EnumIter; -use crate::prelude::*; - -#[derive(Component, Clone)] +#[derive(RenderOnce, Clone)] pub struct KeyBinding { /// A keybinding consists of a key and a set of modifier keys. /// More then one keybinding produces a chord. @@ -12,19 +11,10 @@ pub struct KeyBinding { key_binding: gpui::KeyBinding, } -impl KeyBinding { - pub fn for_action(action: &dyn Action, cx: &mut WindowContext) -> Option { - // todo! this last is arbitrary, we want to prefer users key bindings over defaults, - // and vim over normal (in vim mode), etc. - let key_binding = cx.bindings_for_action(action).last().cloned()?; - Some(Self::new(key_binding)) - } +impl Component for KeyBinding { + type Rendered = Div; - pub fn new(key_binding: gpui::KeyBinding) -> Self { - Self { key_binding } - } - - fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Element { + fn render(self, view: &mut V, cx: &mut ViewContext) -> Self::Rendered { div() .flex() .gap_2() @@ -42,17 +32,29 @@ impl KeyBinding { } } -#[derive(Component)] +impl KeyBinding { + pub fn for_action(action: &dyn Action, cx: &mut WindowContext) -> Option { + // todo! this last is arbitrary, we want to prefer users key bindings over defaults, + // and vim over normal (in vim mode), etc. + let key_binding = cx.bindings_for_action(action).last().cloned()?; + Some(Self::new(key_binding)) + } + + pub fn new(key_binding: gpui::KeyBinding) -> Self { + Self { key_binding } + } +} + +#[derive(RenderOnce)] pub struct Key { key: SharedString, } -impl Key { - pub fn new(key: impl Into) -> Self { - Self { key: key.into() } - } +impl Component for Key { + type Rendered = Div; - fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Element { + fn render(self, view: &mut V, cx: &mut ViewContext) -> Self::Rendered { + let _view: &mut V = view; div() .px_2() .py_0() @@ -64,6 +66,12 @@ impl Key { } } +impl Key { + pub fn new(key: impl Into) -> Self { + Self { key: key.into() } + } +} + // NOTE: The order the modifier keys appear in this enum impacts the order in // which they are rendered in the UI. #[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy, EnumIter)] @@ -92,7 +100,7 @@ mod stories { gpui::KeyBinding::new(key, NoAction {}, None) } - impl Render for KeybindingStory { + impl Render for KeybindingStory { type Element = Div; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { diff --git a/crates/ui2/src/components/label.rs b/crates/ui2/src/components/label.rs index c07c467000..7afb00a96e 100644 --- a/crates/ui2/src/components/label.rs +++ b/crates/ui2/src/components/label.rs @@ -1,7 +1,6 @@ -use gpui::{relative, Hsla, Text, TextRun, WindowContext}; - use crate::prelude::*; use crate::styled_ext::StyledExt; +use gpui::{relative, Div, Hsla, RenderOnce, StyledText, TextRun, WindowContext}; #[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy, Default)] pub enum LabelSize { @@ -60,7 +59,7 @@ pub enum LineHeightStyle { UILabel, } -#[derive(Clone, Component)] +#[derive(Clone, RenderOnce)] pub struct Label { label: SharedString, size: LabelSize, @@ -69,6 +68,33 @@ pub struct Label { strikethrough: bool, } +impl Component for Label { + type Rendered = Div; + + fn render(self, _view: &mut V, cx: &mut ViewContext) -> Self::Rendered { + div() + .when(self.strikethrough, |this| { + this.relative().child( + div() + .absolute() + .top_1_2() + .w_full() + .h_px() + .bg(TextColor::Hidden.color(cx)), + ) + }) + .map(|this| match self.size { + LabelSize::Default => this.text_ui(), + LabelSize::Small => this.text_ui_sm(), + }) + .when(self.line_height_style == LineHeightStyle::UILabel, |this| { + this.line_height(relative(1.)) + }) + .text_color(self.color.color(cx)) + .child(self.label.clone()) + } +} + impl Label { pub fn new(label: impl Into) -> Self { Self { @@ -99,32 +125,9 @@ impl Label { self.strikethrough = strikethrough; self } - - fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Element { - div() - .when(self.strikethrough, |this| { - this.relative().child( - div() - .absolute() - .top_1_2() - .w_full() - .h_px() - .bg(TextColor::Hidden.color(cx)), - ) - }) - .map(|this| match self.size { - LabelSize::Default => this.text_ui(), - LabelSize::Small => this.text_ui_sm(), - }) - .when(self.line_height_style == LineHeightStyle::UILabel, |this| { - this.line_height(relative(1.)) - }) - .text_color(self.color.color(cx)) - .child(self.label.clone()) - } } -#[derive(Component)] +#[derive(RenderOnce)] pub struct HighlightedLabel { label: SharedString, size: LabelSize, @@ -133,35 +136,10 @@ pub struct HighlightedLabel { strikethrough: bool, } -impl HighlightedLabel { - /// shows a label with the given characters highlighted. - /// characters are identified by utf8 byte position. - pub fn new(label: impl Into, highlight_indices: Vec) -> Self { - Self { - label: label.into(), - size: LabelSize::Default, - color: TextColor::Default, - highlight_indices, - strikethrough: false, - } - } +impl Component for HighlightedLabel { + type Rendered = Div; - pub fn size(mut self, size: LabelSize) -> Self { - self.size = size; - self - } - - pub fn color(mut self, color: TextColor) -> Self { - self.color = color; - self - } - - pub fn set_strikethrough(mut self, strikethrough: bool) -> Self { - self.strikethrough = strikethrough; - self - } - - fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Element { + fn render(self, view: &mut V, cx: &mut ViewContext) -> Self::Rendered { let highlight_color = cx.theme().colors().text_accent; let mut text_style = cx.text_style().clone(); @@ -214,7 +192,36 @@ impl HighlightedLabel { LabelSize::Default => this.text_ui(), LabelSize::Small => this.text_ui_sm(), }) - .child(Text::styled(self.label, runs)) + .child(StyledText::new(self.label, runs)) + } +} + +impl HighlightedLabel { + /// shows a label with the given characters highlighted. + /// characters are identified by utf8 byte position. + pub fn new(label: impl Into, highlight_indices: Vec) -> Self { + Self { + label: label.into(), + size: LabelSize::Default, + color: TextColor::Default, + highlight_indices, + strikethrough: false, + } + } + + pub fn size(mut self, size: LabelSize) -> Self { + self.size = size; + self + } + + pub fn color(mut self, color: TextColor) -> Self { + self.color = color; + self + } + + pub fn set_strikethrough(mut self, strikethrough: bool) -> Self { + self.strikethrough = strikethrough; + self } } @@ -235,7 +242,7 @@ mod stories { pub struct LabelStory; - impl Render for LabelStory { + impl Render for LabelStory { type Element = Div; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { diff --git a/crates/ui2/src/components/list.rs b/crates/ui2/src/components/list.rs index 8756d2934c..b183c149fc 100644 --- a/crates/ui2/src/components/list.rs +++ b/crates/ui2/src/components/list.rs @@ -1,4 +1,4 @@ -use gpui::{div, Action}; +use gpui::{div, Action, Div, RenderOnce}; use crate::settings::user_settings; use crate::{ @@ -22,7 +22,7 @@ pub enum ListHeaderMeta { Text(Label), } -#[derive(Component)] +#[derive(RenderOnce)] pub struct ListHeader { label: SharedString, left_icon: Option, @@ -31,33 +31,10 @@ pub struct ListHeader { toggle: Toggle, } -impl ListHeader { - pub fn new(label: impl Into) -> Self { - Self { - label: label.into(), - left_icon: None, - meta: None, - variant: ListItemVariant::default(), - toggle: Toggle::NotToggleable, - } - } +impl Component for ListHeader { + type Rendered = Div; - pub fn toggle(mut self, toggle: Toggle) -> Self { - self.toggle = toggle; - self - } - - pub fn left_icon(mut self, left_icon: Option) -> Self { - self.left_icon = left_icon; - self - } - - pub fn meta(mut self, meta: Option) -> Self { - self.meta = meta; - self - } - - fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Element { + fn render(self, view: &mut V, cx: &mut ViewContext) -> Self::Rendered { let disclosure_control = disclosure_control(self.toggle); let meta = match self.meta { @@ -79,11 +56,6 @@ impl ListHeader { h_stack() .w_full() .bg(cx.theme().colors().surface_background) - // TODO: Add focus state - // .when(self.state == InteractionState::Focused, |this| { - // this.border() - // .border_color(cx.theme().colors().border_focused) - // }) .relative() .child( div() @@ -117,7 +89,94 @@ impl ListHeader { } } -#[derive(Component, Clone)] +impl ListHeader { + pub fn new(label: impl Into) -> Self { + Self { + label: label.into(), + left_icon: None, + meta: None, + variant: ListItemVariant::default(), + toggle: Toggle::NotToggleable, + } + } + + pub fn toggle(mut self, toggle: Toggle) -> Self { + self.toggle = toggle; + self + } + + pub fn left_icon(mut self, left_icon: Option) -> Self { + self.left_icon = left_icon; + self + } + + pub fn meta(mut self, meta: Option) -> Self { + self.meta = meta; + self + } + + // before_ship!("delete") + // fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Element { + // let disclosure_control = disclosure_control(self.toggle); + + // let meta = match self.meta { + // Some(ListHeaderMeta::Tools(icons)) => div().child( + // h_stack() + // .gap_2() + // .items_center() + // .children(icons.into_iter().map(|i| { + // IconElement::new(i) + // .color(TextColor::Muted) + // .size(IconSize::Small) + // })), + // ), + // Some(ListHeaderMeta::Button(label)) => div().child(label), + // Some(ListHeaderMeta::Text(label)) => div().child(label), + // None => div(), + // }; + + // h_stack() + // .w_full() + // .bg(cx.theme().colors().surface_background) + // // TODO: Add focus state + // // .when(self.state == InteractionState::Focused, |this| { + // // this.border() + // // .border_color(cx.theme().colors().border_focused) + // // }) + // .relative() + // .child( + // div() + // .h_5() + // .when(self.variant == ListItemVariant::Inset, |this| this.px_2()) + // .flex() + // .flex_1() + // .items_center() + // .justify_between() + // .w_full() + // .gap_1() + // .child( + // h_stack() + // .gap_1() + // .child( + // div() + // .flex() + // .gap_1() + // .items_center() + // .children(self.left_icon.map(|i| { + // IconElement::new(i) + // .color(TextColor::Muted) + // .size(IconSize::Small) + // })) + // .child(Label::new(self.label.clone()).color(TextColor::Muted)), + // ) + // .child(disclosure_control), + // ) + // .child(meta), + // ) + // } +} + +#[derive(Clone)] pub struct ListSubHeader { label: SharedString, left_icon: Option, @@ -172,7 +231,7 @@ pub enum ListEntrySize { Medium, } -#[derive(Component, Clone)] +#[derive(RenderOnce, Clone)] pub enum ListItem { Entry(ListEntry), Separator(ListSeparator), @@ -197,15 +256,19 @@ impl From for ListItem { } } -impl ListItem { - fn render(self, view: &mut V, cx: &mut ViewContext) -> impl Element { +impl Component for ListItem { + type Rendered = Div; + + fn render(self, view: &mut V, cx: &mut ViewContext) -> Self::Rendered { match self { ListItem::Entry(entry) => div().child(entry.render(view, cx)), ListItem::Separator(separator) => div().child(separator.render(view, cx)), ListItem::Header(header) => div().child(header.render(view, cx)), } } +} +impl ListItem { pub fn new(label: Label) -> Self { Self::Entry(ListEntry::new(label)) } @@ -219,7 +282,7 @@ impl ListItem { } } -#[derive(Component)] +// #[derive(RenderOnce)] pub struct ListEntry { disabled: bool, // TODO: Reintroduce this @@ -377,20 +440,24 @@ impl ListEntry { } } -#[derive(Clone, Component)] +#[derive(RenderOnce, Clone)] pub struct ListSeparator; impl ListSeparator { pub fn new() -> Self { Self } +} - fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Element { +impl Component for ListSeparator { + type Rendered = Div; + + fn render(self, view: &mut V, cx: &mut ViewContext) -> Self::Rendered { div().h_px().w_full().bg(cx.theme().colors().border_variant) } } -#[derive(Component)] +#[derive(RenderOnce)] pub struct List { items: Vec, /// Message to display when the list is empty @@ -400,6 +467,26 @@ pub struct List { toggle: Toggle, } +impl Component for List { + type Rendered = Div; + + fn render(self, view: &mut V, cx: &mut ViewContext) -> Self::Rendered { + let list_content = match (self.items.is_empty(), self.toggle) { + (false, _) => div().children(self.items), + (true, Toggle::Toggled(false)) => div(), + (true, _) => { + div().child(Label::new(self.empty_message.clone()).color(TextColor::Muted)) + } + }; + + v_stack() + .w_full() + .py_1() + .children(self.header.map(|header| header)) + .child(list_content) + } +} + impl List { pub fn new(items: Vec) -> Self { Self { diff --git a/crates/ui2/src/components/modal.rs b/crates/ui2/src/components/modal.rs index ac4cb4017f..da76a79b29 100644 --- a/crates/ui2/src/components/modal.rs +++ b/crates/ui2/src/components/modal.rs @@ -1,9 +1,9 @@ -use gpui::AnyElement; +use gpui::{AnyElement, Div, RenderOnce, Stateful}; use smallvec::SmallVec; use crate::{h_stack, prelude::*, v_stack, Button, Icon, IconButton, Label}; -#[derive(Component)] +#[derive(RenderOnce)] pub struct Modal { id: ElementId, title: Option, @@ -12,33 +12,11 @@ pub struct Modal { children: SmallVec<[AnyElement; 2]>, } -impl Modal { - pub fn new(id: impl Into) -> Self { - Self { - id: id.into(), - title: None, - primary_action: None, - secondary_action: None, - children: SmallVec::new(), - } - } +impl Component for Modal { + type Rendered = Stateful>; - pub fn title(mut self, title: impl Into) -> Self { - self.title = Some(title.into()); - self - } - - pub fn primary_action(mut self, action: Button) -> Self { - self.primary_action = Some(action); - self - } - - pub fn secondary_action(mut self, action: Button) -> Self { - self.secondary_action = Some(action); - self - } - - fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Element { + fn render(self, view: &mut V, cx: &mut ViewContext) -> Self::Rendered { + let _view: &mut V = view; v_stack() .id(self.id.clone()) .w_96() @@ -74,7 +52,34 @@ impl Modal { } } -impl ParentComponent for Modal { +impl Modal { + pub fn new(id: impl Into) -> Self { + Self { + id: id.into(), + title: None, + primary_action: None, + secondary_action: None, + children: SmallVec::new(), + } + } + + pub fn title(mut self, title: impl Into) -> Self { + self.title = Some(title.into()); + self + } + + pub fn primary_action(mut self, action: Button) -> Self { + self.primary_action = Some(action); + self + } + + pub fn secondary_action(mut self, action: Button) -> Self { + self.secondary_action = Some(action); + self + } +} + +impl ParentElement for Modal { fn children_mut(&mut self) -> &mut SmallVec<[AnyElement; 2]> { &mut self.children } diff --git a/crates/ui2/src/components/notification_toast.rs b/crates/ui2/src/components/notification_toast.rs index ec0d2ac216..dd5165e49f 100644 --- a/crates/ui2/src/components/notification_toast.rs +++ b/crates/ui2/src/components/notification_toast.rs @@ -3,7 +3,7 @@ use gpui::rems; use crate::prelude::*; use crate::{h_stack, Icon}; -#[derive(Component)] +// #[derive(RenderOnce)] pub struct NotificationToast { label: SharedString, icon: Option, diff --git a/crates/ui2/src/components/palette.rs b/crates/ui2/src/components/palette.rs index 4b6daea0f9..9870c9e086 100644 --- a/crates/ui2/src/components/palette.rs +++ b/crates/ui2/src/components/palette.rs @@ -1,7 +1,9 @@ use crate::{h_stack, prelude::*, v_stack, KeyBinding, Label}; use gpui::prelude::*; +use gpui::Div; +use gpui::Stateful; -#[derive(Component)] +#[derive(RenderOnce)] pub struct Palette { id: ElementId, input_placeholder: SharedString, @@ -10,6 +12,70 @@ pub struct Palette { default_order: OrderMethod, } +impl Component for Palette { + type Rendered = Stateful>; + + fn render(self, view: &mut V, cx: &mut ViewContext) -> Self::Rendered { + v_stack() + .id(self.id) + .w_96() + .rounded_lg() + .bg(cx.theme().colors().elevated_surface_background) + .border() + .border_color(cx.theme().colors().border) + .child( + v_stack() + .gap_px() + .child(v_stack().py_0p5().px_1().child( + div().px_2().py_0p5().child( + Label::new(self.input_placeholder).color(TextColor::Placeholder), + ), + )) + .child( + div() + .h_px() + .w_full() + .bg(cx.theme().colors().element_background), + ) + .child( + v_stack() + .id("items") + .py_0p5() + .px_1() + .grow() + .max_h_96() + .overflow_y_scroll() + .children( + vec![if self.items.is_empty() { + Some(h_stack().justify_between().px_2().py_1().child( + Label::new(self.empty_string).color(TextColor::Muted), + )) + } else { + None + }] + .into_iter() + .flatten(), + ) + .children(self.items.into_iter().enumerate().map(|(index, item)| { + h_stack() + .id(index) + .justify_between() + .px_2() + .py_0p5() + .rounded_lg() + .hover(|style| { + style.bg(cx.theme().colors().ghost_element_hover) + }) + .active(|style| { + style.bg(cx.theme().colors().ghost_element_active) + }) + .child(item) + })), + ), + ) + } +} + impl Palette { pub fn new(id: impl Into) -> Self { Self { @@ -41,76 +107,33 @@ impl Palette { self.default_order = default_order; self } - - fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Element { - v_stack() - .id(self.id.clone()) - .w_96() - .rounded_lg() - .bg(cx.theme().colors().elevated_surface_background) - .border() - .border_color(cx.theme().colors().border) - .child( - v_stack() - .gap_px() - .child(v_stack().py_0p5().px_1().child(div().px_2().py_0p5().child( - Label::new(self.input_placeholder.clone()).color(TextColor::Placeholder), - ))) - .child( - div() - .h_px() - .w_full() - .bg(cx.theme().colors().element_background), - ) - .child( - v_stack() - .id("items") - .py_0p5() - .px_1() - .grow() - .max_h_96() - .overflow_y_scroll() - .children( - vec![if self.items.is_empty() { - Some( - h_stack().justify_between().px_2().py_1().child( - Label::new(self.empty_string.clone()) - .color(TextColor::Muted), - ), - ) - } else { - None - }] - .into_iter() - .flatten(), - ) - .children(self.items.into_iter().enumerate().map(|(index, item)| { - h_stack() - .id(index) - .justify_between() - .px_2() - .py_0p5() - .rounded_lg() - .hover(|style| { - style.bg(cx.theme().colors().ghost_element_hover) - }) - .active(|style| { - style.bg(cx.theme().colors().ghost_element_active) - }) - .child(item) - })), - ), - ) - } } -#[derive(Component)] +#[derive(RenderOnce)] pub struct PaletteItem { pub label: SharedString, pub sublabel: Option, pub key_binding: Option, } +impl Component for PaletteItem { + type Rendered = Div; + + fn render(self, view: &mut V, cx: &mut ViewContext) -> Self::Rendered { + div() + .flex() + .flex_row() + .grow() + .justify_between() + .child( + v_stack() + .child(Label::new(self.label)) + .children(self.sublabel.map(|sublabel| Label::new(sublabel))), + ) + .children(self.key_binding) + } +} + impl PaletteItem { pub fn new(label: impl Into) -> Self { Self { @@ -134,20 +157,6 @@ impl PaletteItem { self.key_binding = key_binding.into(); self } - - fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Element { - div() - .flex() - .flex_row() - .grow() - .justify_between() - .child( - v_stack() - .child(Label::new(self.label.clone())) - .children(self.sublabel.clone().map(|sublabel| Label::new(sublabel))), - ) - .children(self.key_binding) - } } use gpui::ElementId; @@ -164,7 +173,7 @@ mod stories { pub struct PaletteStory; - impl Render for PaletteStory { + impl Render for PaletteStory { type Element = Div; 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 88aca620da..38d68ab3ea 100644 --- a/crates/ui2/src/components/panel.rs +++ b/crates/ui2/src/components/panel.rs @@ -1,4 +1,4 @@ -use gpui::{prelude::*, AbsoluteLength, AnyElement}; +use gpui::{prelude::*, AbsoluteLength, AnyElement, Div, RenderOnce, Stateful}; use smallvec::SmallVec; use crate::prelude::*; @@ -38,7 +38,7 @@ pub enum PanelSide { use std::collections::HashSet; -#[derive(Component)] +#[derive(RenderOnce)] pub struct Panel { id: ElementId, current_side: PanelSide, @@ -49,6 +49,30 @@ pub struct Panel { children: SmallVec<[AnyElement; 2]>, } +impl Component for Panel { + type Rendered = Stateful>; + + fn render(self, view: &mut V, cx: &mut ViewContext) -> Self::Rendered { + let current_size = self.width.unwrap_or(self.initial_width); + + v_stack() + .id(self.id.clone()) + .flex_initial() + .map(|this| match self.current_side { + PanelSide::Left | PanelSide::Right => this.h_full().w(current_size), + PanelSide::Bottom => this, + }) + .map(|this| match self.current_side { + PanelSide::Left => this.border_r(), + PanelSide::Right => this.border_l(), + PanelSide::Bottom => this.border_b().w_full().h(current_size), + }) + .bg(cx.theme().colors().surface_background) + .border_color(cx.theme().colors().border) + .children(self.children) + } +} + impl Panel { pub fn new(id: impl Into, cx: &mut WindowContext) -> Self { let settings = user_settings(cx); @@ -91,29 +115,9 @@ impl Panel { } self } - - fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Element { - let current_size = self.width.unwrap_or(self.initial_width); - - v_stack() - .id(self.id.clone()) - .flex_initial() - .map(|this| match self.current_side { - PanelSide::Left | PanelSide::Right => this.h_full().w(current_size), - PanelSide::Bottom => this, - }) - .map(|this| match self.current_side { - PanelSide::Left => this.border_r(), - PanelSide::Right => this.border_l(), - PanelSide::Bottom => this.border_b().w_full().h(current_size), - }) - .bg(cx.theme().colors().surface_background) - .border_color(cx.theme().colors().border) - .children(self.children) - } } -impl ParentComponent for Panel { +impl ParentElement for Panel { fn children_mut(&mut self) -> &mut SmallVec<[AnyElement; 2]> { &mut self.children } @@ -126,11 +130,11 @@ pub use stories::*; mod stories { use super::*; use crate::{Label, Story}; - use gpui::{Div, InteractiveComponent, Render}; + use gpui::{Div, InteractiveElement, Render}; pub struct PanelStory; - impl Render for PanelStory { + impl Render for PanelStory { type Element = Div; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { diff --git a/crates/ui2/src/components/player_stack.rs b/crates/ui2/src/components/player_stack.rs index b883f76d35..1af3ab5c5a 100644 --- a/crates/ui2/src/components/player_stack.rs +++ b/crates/ui2/src/components/player_stack.rs @@ -1,19 +1,17 @@ +use gpui::{Div, RenderOnce}; + use crate::prelude::*; use crate::{Avatar, Facepile, PlayerWithCallStatus}; -#[derive(Component)] +#[derive(RenderOnce)] pub struct PlayerStack { player_with_call_status: PlayerWithCallStatus, } -impl PlayerStack { - pub fn new(player_with_call_status: PlayerWithCallStatus) -> Self { - Self { - player_with_call_status, - } - } +impl Component for PlayerStack { + type Rendered = Div; - fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Element { + fn render(self, view: &mut V, cx: &mut ViewContext) -> Self::Rendered { let player = self.player_with_call_status.get_player(); let followers = self @@ -59,3 +57,11 @@ impl PlayerStack { ) } } + +impl PlayerStack { + pub fn new(player_with_call_status: PlayerWithCallStatus) -> Self { + Self { + player_with_call_status, + } + } +} diff --git a/crates/ui2/src/components/tab.rs b/crates/ui2/src/components/tab.rs index 7238dbc337..2d7dadac1a 100644 --- a/crates/ui2/src/components/tab.rs +++ b/crates/ui2/src/components/tab.rs @@ -1,8 +1,8 @@ use crate::prelude::*; use crate::{Icon, IconElement, Label, TextColor}; -use gpui::{prelude::*, red, Div, ElementId, Render, View}; +use gpui::{prelude::*, red, Div, ElementId, Render, RenderOnce, Stateful, View}; -#[derive(Component, Clone)] +#[derive(RenderOnce, Clone)] pub struct Tab { id: ElementId, title: String, @@ -20,7 +20,7 @@ struct TabDragState { title: String, } -impl Render for TabDragState { +impl Render for TabDragState { type Element = Div; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { @@ -28,65 +28,10 @@ impl Render for TabDragState { } } -impl Tab { - pub fn new(id: impl Into) -> Self { - Self { - id: id.into(), - title: "untitled".to_string(), - icon: None, - current: false, - dirty: false, - fs_status: FileSystemStatus::None, - git_status: GitStatus::None, - diagnostic_status: DiagnosticStatus::None, - close_side: IconSide::Right, - } - } +impl Component for Tab { + type Rendered = Stateful>; - pub fn current(mut self, current: bool) -> Self { - self.current = current; - self - } - - pub fn title(mut self, title: String) -> Self { - self.title = title; - self - } - - pub fn icon(mut self, icon: I) -> Self - where - I: Into>, - { - self.icon = icon.into(); - self - } - - pub fn dirty(mut self, dirty: bool) -> Self { - self.dirty = dirty; - self - } - - pub fn fs_status(mut self, fs_status: FileSystemStatus) -> Self { - self.fs_status = fs_status; - self - } - - pub fn git_status(mut self, git_status: GitStatus) -> Self { - self.git_status = git_status; - self - } - - pub fn diagnostic_status(mut self, diagnostic_status: DiagnosticStatus) -> Self { - self.diagnostic_status = diagnostic_status; - self - } - - pub fn close_side(mut self, close_side: IconSide) -> Self { - self.close_side = close_side; - self - } - - fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Element { + fn render(self, view: &mut V, cx: &mut ViewContext) -> Self::Rendered { let has_fs_conflict = self.fs_status == FileSystemStatus::Conflict; let is_deleted = self.fs_status == FileSystemStatus::Deleted; @@ -164,6 +109,65 @@ impl Tab { } } +impl Tab { + pub fn new(id: impl Into) -> Self { + Self { + id: id.into(), + title: "untitled".to_string(), + icon: None, + current: false, + dirty: false, + fs_status: FileSystemStatus::None, + git_status: GitStatus::None, + diagnostic_status: DiagnosticStatus::None, + close_side: IconSide::Right, + } + } + + pub fn current(mut self, current: bool) -> Self { + self.current = current; + self + } + + pub fn title(mut self, title: String) -> Self { + self.title = title; + self + } + + pub fn icon(mut self, icon: I) -> Self + where + I: Into>, + { + self.icon = icon.into(); + self + } + + pub fn dirty(mut self, dirty: bool) -> Self { + self.dirty = dirty; + self + } + + pub fn fs_status(mut self, fs_status: FileSystemStatus) -> Self { + self.fs_status = fs_status; + self + } + + pub fn git_status(mut self, git_status: GitStatus) -> Self { + self.git_status = git_status; + self + } + + pub fn diagnostic_status(mut self, diagnostic_status: DiagnosticStatus) -> Self { + self.diagnostic_status = diagnostic_status; + self + } + + pub fn close_side(mut self, close_side: IconSide) -> Self { + self.close_side = close_side; + self + } +} + #[cfg(feature = "stories")] pub use stories::*; @@ -175,7 +179,7 @@ mod stories { pub struct TabStory; - impl Render for TabStory { + impl Render for TabStory { type Element = Div; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { diff --git a/crates/ui2/src/components/toast.rs b/crates/ui2/src/components/toast.rs index a40f3cace4..153f9c7fdb 100644 --- a/crates/ui2/src/components/toast.rs +++ b/crates/ui2/src/components/toast.rs @@ -1,6 +1,6 @@ use crate::prelude::*; -use gpui::Element; -use gpui::{prelude::*, AnyElement}; +use gpui::{prelude::*, AnyElement, RenderOnce}; +use gpui::{Div, Element}; use smallvec::SmallVec; #[derive(Default, Debug, PartialEq, Eq, Clone, Copy)] @@ -22,41 +22,37 @@ pub enum ToastOrigin { /// they are actively showing the a process in progress. /// /// Only one toast may be visible at a time. -#[derive(Element)] +#[derive(RenderOnce)] pub struct Toast { origin: ToastOrigin, children: SmallVec<[AnyElement; 2]>, } -// impl Element for Toast { -// type State = Option>; +impl Component for Toast { + type Rendered = Div; -// fn element_id(&self) -> Option { -// None -// } + fn render(self, view: &mut V, cx: &mut ViewContext) -> Self::Rendered { + let mut div = div(); -// fn layout( -// &mut self, -// view_state: &mut V, -// _element_state: Option, -// cx: &mut ViewContext, -// ) -> (gpui::LayoutId, Self::State) { -// let mut element = self.render(view_state, cx).into_any(); -// let layout_id = element.layout(view_state, cx); -// (layout_id, Some(element)) -// } + if self.origin == ToastOrigin::Bottom { + div = div.right_1_2(); + } else { + div = div.right_2(); + } -// fn paint( -// self, -// bounds: gpui::Bounds, -// view_state: &mut V, -// element: &mut Self::State, -// cx: &mut ViewContext, -// ) { -// let element = element.take().unwrap(); -// element.paint(view_state, cx); -// } -// } + div.z_index(5) + .absolute() + .bottom_9() + .flex() + .py_1() + .px_1p5() + .rounded_lg() + .shadow_md() + .overflow_hidden() + .bg(cx.theme().colors().elevated_surface_background) + .children(self.children) + } +} impl Toast { pub fn new(origin: ToastOrigin) -> Self { @@ -89,7 +85,7 @@ impl Toast { } } -impl ParentComponent for Toast { +impl ParentElement for Toast { fn children_mut(&mut self) -> &mut SmallVec<[AnyElement; 2]> { &mut self.children } @@ -108,7 +104,7 @@ mod stories { pub struct ToastStory; - impl Render for ToastStory { + impl Render for ToastStory { type Element = Div; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { diff --git a/crates/ui2/src/components/toggle.rs b/crates/ui2/src/components/toggle.rs index 5919a19fc6..afd03c8b89 100644 --- a/crates/ui2/src/components/toggle.rs +++ b/crates/ui2/src/components/toggle.rs @@ -1,4 +1,4 @@ -use gpui::{div, Component, Element, ParentComponent}; +use gpui::{div, Element, ParentElement}; use crate::{Icon, IconElement, IconSize, TextColor}; diff --git a/crates/ui2/src/components/tool_divider.rs b/crates/ui2/src/components/tool_divider.rs index ca443ccb7f..4b59ffe2d8 100644 --- a/crates/ui2/src/components/tool_divider.rs +++ b/crates/ui2/src/components/tool_divider.rs @@ -1,8 +1,17 @@ use crate::prelude::*; +use gpui::{Div, RenderOnce}; -#[derive(Component)] +#[derive(RenderOnce)] pub struct ToolDivider; +impl Component for ToolDivider { + type Rendered = Div; + + fn render(self, view: &mut V, cx: &mut ViewContext) -> Self::Rendered { + div().w_px().h_3().bg(cx.theme().colors().border) + } +} + impl ToolDivider { pub fn new() -> Self { Self diff --git a/crates/ui2/src/components/tooltip.rs b/crates/ui2/src/components/tooltip.rs index a8dae6c97f..33fadf122f 100644 --- a/crates/ui2/src/components/tooltip.rs +++ b/crates/ui2/src/components/tooltip.rs @@ -1,4 +1,4 @@ -use gpui::{overlay, Action, AnyView, Overlay, Render, VisualContext}; +use gpui::{overlay, Action, AnyView, Overlay, Render, RenderOnce, VisualContext}; use settings2::Settings; use theme2::{ActiveTheme, ThemeSettings}; @@ -67,7 +67,7 @@ impl Tooltip { } } -impl Render for Tooltip { +impl Render for Tooltip { type Element = Overlay; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { diff --git a/crates/ui2/src/prelude.rs b/crates/ui2/src/prelude.rs index d4abb78c21..876fec555e 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, InteractiveComponent, ParentComponent, SharedString, - Styled, ViewContext, WindowContext, + div, Component, Element, ElementId, InteractiveElement, ParentElement, SharedString, Styled, + ViewContext, WindowContext, }; pub use crate::elevation::*; diff --git a/crates/ui2/src/static_data.rs b/crates/ui2/src/static_data.rs index bb81d6230f..37649ff8c5 100644 --- a/crates/ui2/src/static_data.rs +++ b/crates/ui2/src/static_data.rs @@ -745,11 +745,11 @@ pub fn hello_world_rust_editor_example(cx: &mut ViewContext) -> Edit PathBuf::from_str("crates/ui/src/static_data.rs").unwrap(), vec![Symbol(vec![ HighlightedText { - text: "fn ".to_string(), + text: "fn ".into(), color: cx.theme().syntax_color("keyword"), }, HighlightedText { - text: "main".to_string(), + text: "main".into(), color: cx.theme().syntax_color("function"), }, ])], @@ -779,15 +779,15 @@ pub fn hello_world_rust_buffer_rows(cx: &AppContext) -> Vec { line: Some(HighlightedLine { highlighted_texts: vec![ HighlightedText { - text: "fn ".to_string(), + text: "fn ".into(), color: cx.theme().syntax_color("keyword"), }, HighlightedText { - text: "main".to_string(), + text: "main".into(), color: cx.theme().syntax_color("function"), }, HighlightedText { - text: "() {".to_string(), + text: "() {".into(), color: cx.theme().colors().text, }, ], @@ -803,7 +803,7 @@ pub fn hello_world_rust_buffer_rows(cx: &AppContext) -> Vec { line: Some(HighlightedLine { highlighted_texts: vec![HighlightedText { text: " // Statements here are executed when the compiled binary is called." - .to_string(), + .into(), color: cx.theme().syntax_color("comment"), }], }), @@ -826,7 +826,7 @@ pub fn hello_world_rust_buffer_rows(cx: &AppContext) -> Vec { current: false, line: Some(HighlightedLine { highlighted_texts: vec![HighlightedText { - text: " // Print text to the console.".to_string(), + text: " // Print text to the console.".into(), color: cx.theme().syntax_color("comment"), }], }), @@ -841,15 +841,15 @@ pub fn hello_world_rust_buffer_rows(cx: &AppContext) -> Vec { line: Some(HighlightedLine { highlighted_texts: vec![ HighlightedText { - text: " println!(".to_string(), + text: " println!(".into(), color: cx.theme().colors().text, }, HighlightedText { - text: "\"Hello, world!\"".to_string(), + text: "\"Hello, world!\"".into(), color: cx.theme().syntax_color("string"), }, HighlightedText { - text: ");".to_string(), + text: ");".into(), color: cx.theme().colors().text, }, ], @@ -864,7 +864,7 @@ pub fn hello_world_rust_buffer_rows(cx: &AppContext) -> Vec { current: false, line: Some(HighlightedLine { highlighted_texts: vec![HighlightedText { - text: "}".to_string(), + text: "}".into(), color: cx.theme().colors().text, }], }), @@ -882,11 +882,11 @@ pub fn hello_world_rust_editor_with_status_example(cx: &mut ViewContext Vec Vec Vec Vec Vec Vec Vec Vec Buffer { Buffer::new("terminal") - .set_title("zed — fish".to_string()) + .set_title(Some("zed — fish".into())) .set_rows(Some(BufferRows { show_line_numbers: false, rows: terminal_buffer_rows(cx), @@ -1060,31 +1060,31 @@ pub fn terminal_buffer_rows(cx: &AppContext) -> Vec { line: Some(HighlightedLine { highlighted_texts: vec![ HighlightedText { - text: "maxdeviant ".to_string(), + text: "maxdeviant ".into(), color: cx.theme().syntax_color("keyword"), }, HighlightedText { - text: "in ".to_string(), + text: "in ".into(), color: cx.theme().colors().text, }, HighlightedText { - text: "profaned-capital ".to_string(), + text: "profaned-capital ".into(), color: cx.theme().syntax_color("function"), }, HighlightedText { - text: "in ".to_string(), + text: "in ".into(), color: cx.theme().colors().text, }, HighlightedText { - text: "~/p/zed ".to_string(), + text: "~/p/zed ".into(), color: cx.theme().syntax_color("function"), }, HighlightedText { - text: "on ".to_string(), + text: "on ".into(), color: cx.theme().colors().text, }, HighlightedText { - text: " gpui2-ui ".to_string(), + text: " gpui2-ui ".into(), color: cx.theme().syntax_color("keyword"), }, ], @@ -1099,7 +1099,7 @@ pub fn terminal_buffer_rows(cx: &AppContext) -> Vec { current: false, line: Some(HighlightedLine { highlighted_texts: vec![HighlightedText { - text: "λ ".to_string(), + text: "λ ".into(), color: cx.theme().syntax_color("string"), }], }), diff --git a/crates/ui2/src/story.rs b/crates/ui2/src/story.rs index b5fef606b7..8a482e155a 100644 --- a/crates/ui2/src/story.rs +++ b/crates/ui2/src/story.rs @@ -15,23 +15,29 @@ impl Story { .bg(cx.theme().colors().background) } - pub fn title(cx: &mut ViewContext, title: &str) -> impl Element { + pub fn title( + cx: &mut ViewContext, + title: impl Into, + ) -> impl Element { div() .text_xl() .text_color(cx.theme().colors().text) - .child(title.to_owned()) + .child(title.into()) } pub fn title_for(cx: &mut ViewContext) -> impl Element { Self::title(cx, std::any::type_name::()) } - pub fn label(cx: &mut ViewContext, label: &str) -> impl Element { + pub fn label( + cx: &mut ViewContext, + label: impl Into, + ) -> impl Element { div() .mt_4() .mb_2() .text_xs() .text_color(cx.theme().colors().text) - .child(label.to_owned()) + .child(label.into()) } } diff --git a/crates/ui2/src/to_extract/assistant_panel.rs b/crates/ui2/src/to_extract/assistant_panel.rs index 708d271b5b..33f4e4b208 100644 --- a/crates/ui2/src/to_extract/assistant_panel.rs +++ b/crates/ui2/src/to_extract/assistant_panel.rs @@ -1,27 +1,17 @@ use crate::prelude::*; use crate::{Icon, IconButton, Label, Panel, PanelSide}; -use gpui::{prelude::*, rems, AbsoluteLength}; +use gpui::{prelude::*, rems, AbsoluteLength, RenderOnce}; -#[derive(Component)] +#[derive(RenderOnce)] pub struct AssistantPanel { id: ElementId, current_side: PanelSide, } -impl AssistantPanel { - pub fn new(id: impl Into) -> Self { - Self { - id: id.into(), - current_side: PanelSide::default(), - } - } +impl Component for AssistantPanel { + type Rendered = Panel; - pub fn side(mut self, side: PanelSide) -> Self { - self.current_side = side; - self - } - - fn render(self, view: &mut V, cx: &mut ViewContext) -> impl Element { + fn render(self, view: &mut V, cx: &mut ViewContext) -> Self::Rendered { Panel::new(self.id.clone(), cx) .children(vec![div() .flex() @@ -64,12 +54,26 @@ impl AssistantPanel { .overflow_y_scroll() .child(Label::new("Is this thing on?")), ) - .render()]) + .into_any()]) .side(self.current_side) .width(AbsoluteLength::Rems(rems(32.))) } } +impl AssistantPanel { + pub fn new(id: impl Into) -> Self { + Self { + id: id.into(), + current_side: PanelSide::default(), + } + } + + pub fn side(mut self, side: PanelSide) -> Self { + self.current_side = side; + self + } +} + #[cfg(feature = "stories")] pub use stories::*; @@ -80,7 +84,7 @@ mod stories { use gpui::{Div, Render}; pub struct AssistantPanelStory; - impl Render for AssistantPanelStory { + impl Render for AssistantPanelStory { type Element = Div; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { diff --git a/crates/ui2/src/to_extract/breadcrumb.rs b/crates/ui2/src/to_extract/breadcrumb.rs index 6990890054..532776fd7f 100644 --- a/crates/ui2/src/to_extract/breadcrumb.rs +++ b/crates/ui2/src/to_extract/breadcrumb.rs @@ -1,30 +1,21 @@ use crate::{h_stack, prelude::*, HighlightedText}; -use gpui::{prelude::*, Div}; +use gpui::{prelude::*, Div, Stateful}; use std::path::PathBuf; #[derive(Clone)] pub struct Symbol(pub Vec); -#[derive(Component)] +#[derive(RenderOnce)] pub struct Breadcrumb { path: PathBuf, symbols: Vec, } -impl Breadcrumb { - pub fn new(path: PathBuf, symbols: Vec) -> Self { - Self { path, symbols } - } +impl Component for Breadcrumb { + type Rendered = Stateful>; - fn render_separator(&self, cx: &WindowContext) -> Div { - div() - .child(" › ") - .text_color(cx.theme().colors().text_muted) - } - - fn render(self, view_state: &mut V, cx: &mut ViewContext) -> impl Element { + fn render(self, view_state: &mut V, cx: &mut ViewContext) -> Self::Rendered { let symbols_len = self.symbols.len(); - h_stack() .id("breadcrumb") .px_1() @@ -33,7 +24,9 @@ impl Breadcrumb { .rounded_md() .hover(|style| style.bg(cx.theme().colors().ghost_element_hover)) .active(|style| style.bg(cx.theme().colors().ghost_element_active)) - .child(self.path.clone().to_str().unwrap().to_string()) + .child(SharedString::from( + self.path.clone().to_str().unwrap().to_string(), + )) .child(if !self.symbols.is_empty() { self.render_separator(cx) } else { @@ -64,6 +57,18 @@ impl Breadcrumb { } } +impl Breadcrumb { + pub fn new(path: PathBuf, symbols: Vec) -> Self { + Self { path, symbols } + } + + fn render_separator(&self, cx: &WindowContext) -> Div { + div() + .child(" › ") + .text_color(cx.theme().colors().text_muted) + } +} + #[cfg(feature = "stories")] pub use stories::*; @@ -76,7 +81,7 @@ mod stories { pub struct BreadcrumbStory; - impl Render for BreadcrumbStory { + impl Render for BreadcrumbStory { type Element = Div; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { @@ -88,21 +93,21 @@ mod stories { vec![ Symbol(vec![ HighlightedText { - text: "impl ".to_string(), + text: "impl ".into(), color: cx.theme().syntax_color("keyword"), }, HighlightedText { - text: "BreadcrumbStory".to_string(), + text: "BreadcrumbStory".into(), color: cx.theme().syntax_color("function"), }, ]), Symbol(vec![ HighlightedText { - text: "fn ".to_string(), + text: "fn ".into(), color: cx.theme().syntax_color("keyword"), }, HighlightedText { - text: "render".to_string(), + text: "render".into(), color: cx.theme().syntax_color("function"), }, ]), diff --git a/crates/ui2/src/to_extract/buffer.rs b/crates/ui2/src/to_extract/buffer.rs index c8223daf2f..ac4665614b 100644 --- a/crates/ui2/src/to_extract/buffer.rs +++ b/crates/ui2/src/to_extract/buffer.rs @@ -1,4 +1,4 @@ -use gpui::{Hsla, WindowContext}; +use gpui::{Div, Hsla, RenderOnce, WindowContext}; use crate::prelude::*; use crate::{h_stack, v_stack, Icon, IconElement}; @@ -11,7 +11,7 @@ pub struct PlayerCursor { #[derive(Default, PartialEq, Clone)] pub struct HighlightedText { - pub text: String, + pub text: SharedString, pub color: Hsla, } @@ -107,7 +107,7 @@ impl BufferRow { } } -#[derive(Component, Clone)] +#[derive(RenderOnce, Clone)] pub struct Buffer { id: ElementId, rows: Option, @@ -117,6 +117,21 @@ pub struct Buffer { path: Option, } +impl Component for Buffer { + type Rendered = Div; + + fn render(self, view: &mut V, cx: &mut ViewContext) -> Self::Rendered { + let rows = self.render_rows(cx); + + v_stack() + .flex_1() + .w_full() + .h_full() + .bg(cx.theme().colors().editor_background) + .children(rows) + } +} + impl Buffer { pub fn new(id: impl Into) -> Self { Self { @@ -186,7 +201,7 @@ impl Buffer { h_stack().justify_end().px_0p5().w_3().child( div() .text_color(line_number_color) - .child(row.line_number.to_string()), + .child(SharedString::from(row.line_number.to_string())), ), ) }) @@ -239,7 +254,7 @@ mod stories { pub struct BufferStory; - impl Render for BufferStory { + impl Render for BufferStory { type Element = Div; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { diff --git a/crates/ui2/src/to_extract/buffer_search.rs b/crates/ui2/src/to_extract/buffer_search.rs index 996ac6d253..3a89465911 100644 --- a/crates/ui2/src/to_extract/buffer_search.rs +++ b/crates/ui2/src/to_extract/buffer_search.rs @@ -1,7 +1,6 @@ -use gpui::{Div, Render, View, VisualContext}; - use crate::prelude::*; use crate::{h_stack, Icon, IconButton, Input, TextColor}; +use gpui::{Div, Render, RenderOnce, View, VisualContext}; #[derive(Clone)] pub struct BufferSearch { @@ -26,7 +25,7 @@ impl BufferSearch { } } -impl Render for BufferSearch { +impl Render for BufferSearch { type Element = Div; fn render(&mut self, cx: &mut ViewContext) -> Div { diff --git a/crates/ui2/src/to_extract/chat_panel.rs b/crates/ui2/src/to_extract/chat_panel.rs index 528e40f903..00655364bf 100644 --- a/crates/ui2/src/to_extract/chat_panel.rs +++ b/crates/ui2/src/to_extract/chat_panel.rs @@ -1,27 +1,17 @@ use crate::{prelude::*, Icon, IconButton, Input, Label}; use chrono::NaiveDateTime; -use gpui::prelude::*; +use gpui::{prelude::*, Div, Stateful}; -#[derive(Component)] +#[derive(RenderOnce)] pub struct ChatPanel { element_id: ElementId, messages: Vec, } -impl ChatPanel { - pub fn new(element_id: impl Into) -> Self { - Self { - element_id: element_id.into(), - messages: Vec::new(), - } - } +impl Component for ChatPanel { + type Rendered = Stateful>; - pub fn messages(mut self, messages: Vec) -> Self { - self.messages = messages; - self - } - - fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Element { + fn render(self, view: &mut V, cx: &mut ViewContext) -> Self::Rendered { div() .id(self.element_id.clone()) .flex() @@ -67,23 +57,31 @@ impl ChatPanel { } } -#[derive(Component)] +impl ChatPanel { + pub fn new(element_id: impl Into) -> Self { + Self { + element_id: element_id.into(), + messages: Vec::new(), + } + } + + pub fn messages(mut self, messages: Vec) -> Self { + self.messages = messages; + self + } +} + +#[derive(RenderOnce)] pub struct ChatMessage { author: String, text: String, sent_at: NaiveDateTime, } -impl ChatMessage { - pub fn new(author: String, text: String, sent_at: NaiveDateTime) -> Self { - Self { - author, - text, - sent_at, - } - } +impl Component for ChatMessage { + type Rendered = Div; - fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Element { + fn render(self, view: &mut V, cx: &mut ViewContext) -> Self::Rendered { div() .flex() .flex_col() @@ -101,6 +99,16 @@ impl ChatMessage { } } +impl ChatMessage { + pub fn new(author: String, text: String, sent_at: NaiveDateTime) -> Self { + Self { + author, + text, + sent_at, + } + } +} + #[cfg(feature = "stories")] pub use stories::*; @@ -115,7 +123,7 @@ mod stories { pub struct ChatPanelStory; - impl Render for ChatPanelStory { + impl Render for ChatPanelStory { type Element = Div; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { diff --git a/crates/ui2/src/to_extract/collab_panel.rs b/crates/ui2/src/to_extract/collab_panel.rs index 55efbb5ec5..e5fafa62f1 100644 --- a/crates/ui2/src/to_extract/collab_panel.rs +++ b/crates/ui2/src/to_extract/collab_panel.rs @@ -2,19 +2,17 @@ use crate::{ prelude::*, static_collab_panel_channels, static_collab_panel_current_call, v_stack, Icon, List, ListHeader, Toggle, }; -use gpui::prelude::*; +use gpui::{prelude::*, Div, Stateful}; -#[derive(Component)] +#[derive(RenderOnce)] pub struct CollabPanel { id: ElementId, } -impl CollabPanel { - pub fn new(id: impl Into) -> Self { - Self { id: id.into() } - } +impl Component for CollabPanel { + type Rendered = Stateful>; - fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Element { + fn render(self, view: &mut V, cx: &mut ViewContext) -> Self::Rendered { v_stack() .id(self.id.clone()) .h_full() @@ -86,6 +84,12 @@ impl CollabPanel { } } +impl CollabPanel { + pub fn new(id: impl Into) -> Self { + Self { id: id.into() } + } +} + #[cfg(feature = "stories")] pub use stories::*; @@ -97,7 +101,7 @@ mod stories { pub struct CollabPanelStory; - impl Render for CollabPanelStory { + impl Render for CollabPanelStory { type Element = Div; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { diff --git a/crates/ui2/src/to_extract/command_palette.rs b/crates/ui2/src/to_extract/command_palette.rs index 353e1daac8..032e3bc639 100644 --- a/crates/ui2/src/to_extract/command_palette.rs +++ b/crates/ui2/src/to_extract/command_palette.rs @@ -1,17 +1,15 @@ use crate::prelude::*; use crate::{example_editor_actions, OrderMethod, Palette}; -#[derive(Component)] +#[derive(RenderOnce)] pub struct CommandPalette { id: ElementId, } -impl CommandPalette { - pub fn new(id: impl Into) -> Self { - Self { id: id.into() } - } +impl Component for CommandPalette { + type Rendered = Stateful>; - fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Element { + fn render(self, view: &mut V, cx: &mut ViewContext) -> Self::Rendered { div().id(self.id.clone()).child( Palette::new("palette") .items(example_editor_actions()) @@ -22,6 +20,13 @@ impl CommandPalette { } } +impl CommandPalette { + pub fn new(id: impl Into) -> Self { + Self { id: id.into() } + } +} + +use gpui::{Div, RenderOnce, Stateful}; #[cfg(feature = "stories")] pub use stories::*; @@ -35,7 +40,7 @@ mod stories { pub struct CommandPaletteStory; - impl Render for CommandPaletteStory { + impl Render for CommandPaletteStory { type Element = Div; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { diff --git a/crates/ui2/src/to_extract/copilot.rs b/crates/ui2/src/to_extract/copilot.rs index b07c562c13..d0b11a3330 100644 --- a/crates/ui2/src/to_extract/copilot.rs +++ b/crates/ui2/src/to_extract/copilot.rs @@ -1,39 +1,42 @@ use crate::{prelude::*, Button, Label, Modal, TextColor}; -#[derive(Component)] +#[derive(RenderOnce)] pub struct CopilotModal { id: ElementId, } +impl Component for CopilotModal { + type Rendered = Stateful>; + + fn render(self, view: &mut V, cx: &mut ViewContext) -> Self::Rendered { + div().id(self.id.clone()).child( + Modal::new("some-id") + .title("Connect Copilot to Zed") + .child(Label::new("You can update your settings or sign out from the Copilot menu in the status bar.").color(TextColor::Muted)) + .primary_action(Button::new("Connect to Github").variant(ButtonVariant::Filled)), + ) + } +} + impl CopilotModal { pub fn new(id: impl Into) -> Self { Self { id: id.into() } } - - fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Element { - div().id(self.id.clone()).child( - Modal::new("some-id") - .title("Connect Copilot to Zed") - .child(Label::new("You can update your settings or sign out from the Copilot menu in the status bar.").color(TextColor::Muted)) - .primary_action(Button::new("Connect to Github").variant(ButtonVariant::Filled)), - ) - } } +use gpui::{Div, RenderOnce, Stateful}; #[cfg(feature = "stories")] pub use stories::*; #[cfg(feature = "stories")] mod stories { - use gpui::{Div, Render}; - - use crate::Story; - use super::*; + use crate::Story; + use gpui::{Div, Render}; pub struct CopilotModalStory; - impl Render for CopilotModalStory { + impl Render for CopilotModalStory { type Element = Div; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { diff --git a/crates/ui2/src/to_extract/editor_pane.rs b/crates/ui2/src/to_extract/editor_pane.rs index bd34c22805..799716c270 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::{Div, Render, RenderOnce, View, VisualContext}; use crate::prelude::*; use crate::{ @@ -47,7 +47,7 @@ impl EditorPane { } } -impl Render for EditorPane { +impl Render for EditorPane { type Element = Div; fn render(&mut self, cx: &mut ViewContext) -> Div { diff --git a/crates/ui2/src/to_extract/language_selector.rs b/crates/ui2/src/to_extract/language_selector.rs index e05145e8c8..c6a8457e0b 100644 --- a/crates/ui2/src/to_extract/language_selector.rs +++ b/crates/ui2/src/to_extract/language_selector.rs @@ -1,11 +1,36 @@ use crate::prelude::*; use crate::{OrderMethod, Palette, PaletteItem}; -#[derive(Component)] +#[derive(RenderOnce)] pub struct LanguageSelector { id: ElementId, } +impl Component for LanguageSelector { + type Rendered = Stateful>; + + fn render(self, view: &mut V, cx: &mut ViewContext) -> Self::Rendered { + div().id(self.id.clone()).child( + Palette::new("palette") + .items(vec![ + PaletteItem::new("C"), + PaletteItem::new("C++"), + PaletteItem::new("CSS"), + PaletteItem::new("Elixir"), + PaletteItem::new("Elm"), + PaletteItem::new("ERB"), + PaletteItem::new("Rust (current)"), + PaletteItem::new("Scheme"), + PaletteItem::new("TOML"), + PaletteItem::new("TypeScript"), + ]) + .placeholder("Select a language...") + .empty_string("No matches") + .default_order(OrderMethod::Ascending), + ) + } +} + impl LanguageSelector { pub fn new(id: impl Into) -> Self { Self { id: id.into() } @@ -33,6 +58,7 @@ impl LanguageSelector { } } +use gpui::{Div, RenderOnce, Stateful}; #[cfg(feature = "stories")] pub use stories::*; @@ -44,7 +70,7 @@ mod stories { pub struct LanguageSelectorStory; - impl Render for LanguageSelectorStory { + impl Render for LanguageSelectorStory { type Element = Div; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { diff --git a/crates/ui2/src/to_extract/multi_buffer.rs b/crates/ui2/src/to_extract/multi_buffer.rs index 186303365b..7967a1e590 100644 --- a/crates/ui2/src/to_extract/multi_buffer.rs +++ b/crates/ui2/src/to_extract/multi_buffer.rs @@ -1,17 +1,15 @@ use crate::prelude::*; use crate::{v_stack, Buffer, Icon, IconButton, Label}; -#[derive(Component)] +#[derive(RenderOnce)] pub struct MultiBuffer { buffers: Vec, } -impl MultiBuffer { - pub fn new(buffers: Vec) -> Self { - Self { buffers } - } +impl Component for MultiBuffer { + type Rendered = Div; - fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Element { + fn render(self, view: &mut V, cx: &mut ViewContext) -> Self::Rendered { v_stack() .w_full() .h_full() @@ -33,6 +31,13 @@ impl MultiBuffer { } } +impl MultiBuffer { + pub fn new(buffers: Vec) -> Self { + Self { buffers } + } +} + +use gpui::{Div, RenderOnce}; #[cfg(feature = "stories")] pub use stories::*; @@ -44,7 +49,7 @@ mod stories { pub struct MultiBufferStory; - impl Render for MultiBufferStory { + impl Render for MultiBufferStory { type Element = Div; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { diff --git a/crates/ui2/src/to_extract/notifications_panel.rs b/crates/ui2/src/to_extract/notifications_panel.rs index fa7f8c2bd5..f45b12f0c2 100644 --- a/crates/ui2/src/to_extract/notifications_panel.rs +++ b/crates/ui2/src/to_extract/notifications_panel.rs @@ -3,19 +3,17 @@ use crate::{ v_stack, Avatar, ButtonOrIconButton, ClickHandler, Icon, IconElement, Label, LineHeightStyle, ListHeader, ListHeaderMeta, ListSeparator, PublicPlayer, TextColor, UnreadIndicator, }; -use gpui::prelude::*; +use gpui::{prelude::*, Div, Stateful}; -#[derive(Component)] +#[derive(RenderOnce)] pub struct NotificationsPanel { id: ElementId, } -impl NotificationsPanel { - pub fn new(id: impl Into) -> Self { - Self { id: id.into() } - } +impl Component for NotificationsPanel { + type Rendered = Stateful>; - fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Element { + fn render(self, view: &mut V, cx: &mut ViewContext) -> Self::Rendered { div() .id(self.id.clone()) .flex() @@ -56,6 +54,12 @@ impl NotificationsPanel { } } +impl NotificationsPanel { + pub fn new(id: impl Into) -> Self { + Self { id: id.into() } + } +} + pub struct NotificationAction { button: ButtonOrIconButton, tooltip: SharedString, @@ -102,7 +106,7 @@ impl Default for NotificationHandlers { } } -#[derive(Component)] +#[derive(RenderOnce)] pub struct Notification { id: ElementId, slot: ActorOrIcon, @@ -116,6 +120,85 @@ pub struct Notification { handlers: NotificationHandlers, } +impl Component for Notification { + type Rendered = Stateful>; + + fn render(self, view: &mut V, cx: &mut ViewContext) -> Self::Rendered { + div() + .relative() + .id(self.id.clone()) + .p_1() + .flex() + .flex_col() + .w_full() + .children( + Some( + div() + .absolute() + .left(px(3.0)) + .top_3() + .z_index(2) + .child(UnreadIndicator::new()), + ) + .filter(|_| self.unread), + ) + .child( + v_stack() + .z_index(1) + .gap_1() + .w_full() + .child( + h_stack() + .w_full() + .gap_2() + .child(self.render_slot(cx)) + .child(div().flex_1().child(Label::new(self.message.clone()))), + ) + .child( + h_stack() + .justify_between() + .child( + h_stack() + .gap_1() + .child( + Label::new(naive_format_distance_from_now( + self.date_received, + true, + true, + )) + .color(TextColor::Muted), + ) + .child(self.render_meta_items(cx)), + ) + .child(match (self.actions, self.action_taken) { + // Show nothing + (None, _) => div(), + // Show the taken_message + (Some(_), Some(action_taken)) => h_stack() + .children(action_taken.taken_message.0.map(|icon| { + IconElement::new(icon).color(crate::TextColor::Muted) + })) + .child( + Label::new(action_taken.taken_message.1.clone()) + .color(TextColor::Muted), + ), + // Show the actions + (Some(actions), None) => { + h_stack().children(actions.map(|action| match action.button { + ButtonOrIconButton::Button(button) => { + button.render_into_any() + } + ButtonOrIconButton::IconButton(icon_button) => { + icon_button.render_into_any() + } + })) + } + }), + ), + ) + } +} + impl Notification { fn new( id: ElementId, @@ -262,85 +345,10 @@ impl Notification { fn render_slot(&self, cx: &mut ViewContext) -> impl Element { match &self.slot { - ActorOrIcon::Actor(actor) => Avatar::new(actor.avatar.clone()).render(), - ActorOrIcon::Icon(icon) => IconElement::new(icon.clone()).render(), + ActorOrIcon::Actor(actor) => Avatar::new(actor.avatar.clone()).render_into_any(), + ActorOrIcon::Icon(icon) => IconElement::new(icon.clone()).render_into_any(), } } - - fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Element { - div() - .relative() - .id(self.id.clone()) - .p_1() - .flex() - .flex_col() - .w_full() - .children( - Some( - div() - .absolute() - .left(px(3.0)) - .top_3() - .z_index(2) - .child(UnreadIndicator::new()), - ) - .filter(|_| self.unread), - ) - .child( - v_stack() - .z_index(1) - .gap_1() - .w_full() - .child( - h_stack() - .w_full() - .gap_2() - .child(self.render_slot(cx)) - .child(div().flex_1().child(Label::new(self.message.clone()))), - ) - .child( - h_stack() - .justify_between() - .child( - h_stack() - .gap_1() - .child( - Label::new(naive_format_distance_from_now( - self.date_received, - true, - true, - )) - .color(TextColor::Muted), - ) - .child(self.render_meta_items(cx)), - ) - .child(match (self.actions, self.action_taken) { - // Show nothing - (None, _) => div(), - // Show the taken_message - (Some(_), Some(action_taken)) => h_stack() - .children(action_taken.taken_message.0.map(|icon| { - IconElement::new(icon).color(crate::TextColor::Muted) - })) - .child( - Label::new(action_taken.taken_message.1.clone()) - .color(TextColor::Muted), - ), - // Show the actions - (Some(actions), None) => { - h_stack().children(actions.map(|action| match action.button { - ButtonOrIconButton::Button(button) => { - Component::render(button) - } - ButtonOrIconButton::IconButton(icon_button) => { - Component::render(icon_button) - } - })) - } - }), - ), - ) - } } use chrono::NaiveDateTime; @@ -356,7 +364,7 @@ mod stories { pub struct NotificationsPanelStory; - impl Render for NotificationsPanelStory { + impl Render for NotificationsPanelStory { type Element = Div; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { diff --git a/crates/ui2/src/to_extract/panes.rs b/crates/ui2/src/to_extract/panes.rs index 3b75d55d77..92bf87783f 100644 --- a/crates/ui2/src/to_extract/panes.rs +++ b/crates/ui2/src/to_extract/panes.rs @@ -1,4 +1,7 @@ -use gpui::{hsla, red, AnyElement, ElementId, ExternalPaths, Hsla, Length, Size, View}; +use gpui::{ + hsla, red, AnyElement, Div, ElementId, ExternalPaths, Hsla, Length, RenderOnce, Size, Stateful, + View, +}; use smallvec::SmallVec; use crate::prelude::*; @@ -10,7 +13,7 @@ pub enum SplitDirection { Vertical, } -#[derive(Component)] +#[derive(RenderOnce)] pub struct Pane { id: ElementId, size: Size, @@ -18,24 +21,10 @@ pub struct Pane { children: SmallVec<[AnyElement; 2]>, } -impl Pane { - pub fn new(id: impl Into, size: Size) -> Self { - // Fill is only here for debugging purposes, remove before release +impl Component for Pane { + type Rendered = Stateful>; - Self { - id: id.into(), - size, - fill: hsla(0.3, 0.3, 0.3, 1.), - children: SmallVec::new(), - } - } - - pub fn fill(mut self, fill: Hsla) -> Self { - self.fill = fill; - self - } - - fn render(self, view: &mut V, cx: &mut ViewContext) -> impl Element { + fn render(self, view: &mut V, cx: &mut ViewContext) -> Self::Rendered { div() .id(self.id.clone()) .flex() @@ -59,37 +48,41 @@ impl Pane { } } -impl ParentComponent for Pane { +impl Pane { + pub fn new(id: impl Into, size: Size) -> Self { + // Fill is only here for debugging purposes, remove before release + + Self { + id: id.into(), + size, + fill: hsla(0.3, 0.3, 0.3, 1.), + children: SmallVec::new(), + } + } + + pub fn fill(mut self, fill: Hsla) -> Self { + self.fill = fill; + self + } +} + +impl ParentElement for Pane { fn children_mut(&mut self) -> &mut SmallVec<[AnyElement; 2]> { &mut self.children } } -#[derive(Component)] +#[derive(RenderOnce)] pub struct PaneGroup { groups: Vec>, panes: Vec>, split_direction: SplitDirection, } -impl PaneGroup { - pub fn new_groups(groups: Vec>, split_direction: SplitDirection) -> Self { - Self { - groups, - panes: Vec::new(), - split_direction, - } - } +impl Component for PaneGroup { + type Rendered = Div; - pub fn new_panes(panes: Vec>, split_direction: SplitDirection) -> Self { - Self { - groups: Vec::new(), - panes, - split_direction, - } - } - - fn render(self, view: &mut V, cx: &mut ViewContext) -> impl Element { + fn render(self, view: &mut V, cx: &mut ViewContext) -> Self::Rendered { if !self.panes.is_empty() { let el = div() .flex() @@ -126,3 +119,21 @@ impl PaneGroup { unreachable!() } } + +impl PaneGroup { + pub fn new_groups(groups: Vec>, split_direction: SplitDirection) -> Self { + Self { + groups, + panes: Vec::new(), + split_direction, + } + } + + pub fn new_panes(panes: Vec>, split_direction: SplitDirection) -> Self { + Self { + groups: Vec::new(), + panes, + split_direction, + } + } +} diff --git a/crates/ui2/src/to_extract/project_panel.rs b/crates/ui2/src/to_extract/project_panel.rs index ccaaecf2ce..06735356c7 100644 --- a/crates/ui2/src/to_extract/project_panel.rs +++ b/crates/ui2/src/to_extract/project_panel.rs @@ -3,12 +3,50 @@ use crate::{ ListHeader, }; use gpui::prelude::*; +use gpui::Div; +use gpui::Stateful; -#[derive(Component)] +#[derive(RenderOnce)] pub struct ProjectPanel { id: ElementId, } +impl Component for ProjectPanel { + type Rendered = Stateful>; + + fn render(self, view: &mut V, cx: &mut ViewContext) -> Self::Rendered { + div() + .id(self.id.clone()) + .flex() + .flex_col() + .size_full() + .bg(cx.theme().colors().surface_background) + .child( + div() + .id("project-panel-contents") + .w_full() + .flex() + .flex_col() + .overflow_y_scroll() + .child( + List::new(static_project_panel_single_items()) + .header(ListHeader::new("FILES")) + .empty_message("No files in directory"), + ) + .child( + List::new(static_project_panel_project_items()) + .header(ListHeader::new("PROJECT")) + .empty_message("No folders in directory"), + ), + ) + .child( + Input::new("Find something...") + .value("buffe".to_string()) + .state(InteractionState::Focused), + ) + } +} + impl ProjectPanel { pub fn new(id: impl Into) -> Self { Self { id: id.into() } @@ -59,7 +97,7 @@ mod stories { pub struct ProjectPanelStory; - impl Render for ProjectPanelStory { + impl Render for ProjectPanelStory { type Element = Div; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { diff --git a/crates/ui2/src/to_extract/recent_projects.rs b/crates/ui2/src/to_extract/recent_projects.rs index 2db7d94eac..3ebffb6bef 100644 --- a/crates/ui2/src/to_extract/recent_projects.rs +++ b/crates/ui2/src/to_extract/recent_projects.rs @@ -1,17 +1,15 @@ use crate::prelude::*; use crate::{OrderMethod, Palette, PaletteItem}; -#[derive(Component)] +#[derive(RenderOnce)] pub struct RecentProjects { id: ElementId, } -impl RecentProjects { - pub fn new(id: impl Into) -> Self { - Self { id: id.into() } - } +impl Component for RecentProjects { + type Rendered = Stateful>; - fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Element { + fn render(self, view: &mut V, cx: &mut ViewContext) -> Self::Rendered { div().id(self.id.clone()).child( Palette::new("palette") .items(vec![ @@ -29,6 +27,13 @@ impl RecentProjects { } } +impl RecentProjects { + pub fn new(id: impl Into) -> Self { + Self { id: id.into() } + } +} + +use gpui::{Div, RenderOnce, Stateful}; #[cfg(feature = "stories")] pub use stories::*; @@ -40,7 +45,7 @@ mod stories { pub struct RecentProjectsStory; - impl Render for RecentProjectsStory { + impl Render for RecentProjectsStory { type Element = Div; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { diff --git a/crates/ui2/src/to_extract/status_bar.rs b/crates/ui2/src/to_extract/status_bar.rs index eee96ecad8..b07c45aa75 100644 --- a/crates/ui2/src/to_extract/status_bar.rs +++ b/crates/ui2/src/to_extract/status_bar.rs @@ -1,5 +1,7 @@ use std::sync::Arc; +use gpui::{Div, RenderOnce}; + use crate::prelude::*; use crate::{Button, Icon, IconButton, TextColor, ToolDivider, Workspace}; @@ -28,14 +30,31 @@ impl Default for ToolGroup { } } -#[derive(Component)] -#[component(view_type = "Workspace")] +#[derive(RenderOnce)] +#[view = "Workspace"] pub struct StatusBar { left_tools: Option, right_tools: Option, bottom_tools: Option, } +impl Component for StatusBar { + type Rendered = Div; + + fn render(self, view: &mut Workspace, cx: &mut ViewContext) -> Self::Rendered { + div() + .py_0p5() + .px_1() + .flex() + .items_center() + .justify_between() + .w_full() + .bg(cx.theme().colors().status_bar_background) + .child(self.left_tools(view, cx)) + .child(self.right_tools(view, cx)) + } +} + impl StatusBar { pub fn new() -> Self { Self { @@ -81,28 +100,7 @@ impl StatusBar { self } - fn render( - self, - view: &mut Workspace, - cx: &mut ViewContext, - ) -> impl Component { - div() - .py_0p5() - .px_1() - .flex() - .items_center() - .justify_between() - .w_full() - .bg(cx.theme().colors().status_bar_background) - .child(self.left_tools(view, cx)) - .child(self.right_tools(view, cx)) - } - - fn left_tools( - &self, - workspace: &mut Workspace, - cx: &WindowContext, - ) -> impl Component { + fn left_tools(&self, workspace: &mut Workspace, cx: &WindowContext) -> impl Element { div() .flex() .items_center() @@ -133,7 +131,7 @@ impl StatusBar { &self, workspace: &mut Workspace, cx: &WindowContext, - ) -> impl Component { + ) -> impl Element { div() .flex() .items_center() diff --git a/crates/ui2/src/to_extract/tab_bar.rs b/crates/ui2/src/to_extract/tab_bar.rs index 8888620dae..80c165b97e 100644 --- a/crates/ui2/src/to_extract/tab_bar.rs +++ b/crates/ui2/src/to_extract/tab_bar.rs @@ -1,7 +1,9 @@ use crate::{prelude::*, Icon, IconButton, Tab}; use gpui::prelude::*; +use gpui::Div; +use gpui::Stateful; -#[derive(Component)] +#[derive(RenderOnce)] pub struct TabBar { id: ElementId, /// Backwards, Forwards @@ -9,21 +11,10 @@ pub struct TabBar { tabs: Vec, } -impl TabBar { - pub fn new(id: impl Into, tabs: Vec) -> Self { - Self { - id: id.into(), - can_navigate: (false, false), - tabs, - } - } +impl Component for TabBar { + type Rendered = Stateful>; - pub fn can_navigate(mut self, can_navigate: (bool, bool)) -> Self { - self.can_navigate = can_navigate; - self - } - - fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Element { + fn render(self, view: &mut V, cx: &mut ViewContext) -> Self::Rendered { let (can_navigate_back, can_navigate_forward) = self.can_navigate; div() @@ -92,6 +83,21 @@ impl TabBar { } } +impl TabBar { + pub fn new(id: impl Into, tabs: Vec) -> Self { + Self { + id: id.into(), + can_navigate: (false, false), + tabs, + } + } + + pub fn can_navigate(mut self, can_navigate: (bool, bool)) -> Self { + self.can_navigate = can_navigate; + self + } +} + use gpui::ElementId; #[cfg(feature = "stories")] pub use stories::*; @@ -104,7 +110,7 @@ mod stories { pub struct TabBarStory; - impl Render for TabBarStory { + impl Render for TabBarStory { type Element = Div; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { diff --git a/crates/ui2/src/to_extract/terminal.rs b/crates/ui2/src/to_extract/terminal.rs index d639986082..4cc43d4983 100644 --- a/crates/ui2/src/to_extract/terminal.rs +++ b/crates/ui2/src/to_extract/terminal.rs @@ -1,11 +1,78 @@ -use gpui::{relative, rems, Size}; - use crate::prelude::*; use crate::{Icon, IconButton, Pane, Tab}; +use gpui::{relative, rems, Div, RenderOnce, Size}; -#[derive(Component)] +#[derive(RenderOnce)] pub struct Terminal; +impl Component for Terminal { + type Rendered = Div; + + fn render(self, view: &mut V, cx: &mut ViewContext) -> Self::Rendered { + let can_navigate_back = true; + let can_navigate_forward = false; + + div() + .flex() + .flex_col() + .w_full() + .child( + // Terminal Tabs. + div() + .w_full() + .flex() + .bg(cx.theme().colors().surface_background) + .child( + div().px_1().flex().flex_none().gap_2().child( + div() + .flex() + .items_center() + .gap_px() + .child( + IconButton::new("arrow_left", Icon::ArrowLeft).state( + InteractionState::Enabled.if_enabled(can_navigate_back), + ), + ) + .child(IconButton::new("arrow_right", Icon::ArrowRight).state( + InteractionState::Enabled.if_enabled(can_navigate_forward), + )), + ), + ) + .child( + div().w_0().flex_1().h_full().child( + div() + .flex() + .child( + Tab::new(1) + .title("zed — fish".to_string()) + .icon(Icon::Terminal) + .close_side(IconSide::Right) + .current(true), + ) + .child( + Tab::new(2) + .title("zed — fish".to_string()) + .icon(Icon::Terminal) + .close_side(IconSide::Right) + .current(false), + ), + ), + ), + ) + // Terminal Pane. + .child( + Pane::new( + "terminal", + Size { + width: relative(1.).into(), + height: rems(36.).into(), + }, + ) + .child(crate::static_data::terminal_buffer(cx)), + ) + } +} + impl Terminal { pub fn new() -> Self { Self @@ -86,7 +153,7 @@ mod stories { use gpui::{Div, Render}; pub struct TerminalStory; - impl Render for TerminalStory { + impl Render for TerminalStory { type Element = Div; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { diff --git a/crates/ui2/src/to_extract/theme_selector.rs b/crates/ui2/src/to_extract/theme_selector.rs index 175d126133..7b08195a57 100644 --- a/crates/ui2/src/to_extract/theme_selector.rs +++ b/crates/ui2/src/to_extract/theme_selector.rs @@ -1,17 +1,16 @@ use crate::prelude::*; use crate::{OrderMethod, Palette, PaletteItem}; -#[derive(Component)] +#[derive(RenderOnce)] pub struct ThemeSelector { id: ElementId, } -impl ThemeSelector { - pub fn new(id: impl Into) -> Self { - Self { id: id.into() } - } +impl Component for ThemeSelector { + type Rendered = Div; - fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Element { + fn render(self, view: &mut V, cx: &mut ViewContext) -> Self::Rendered { + let cx: &mut ViewContext = cx; div().child( Palette::new(self.id.clone()) .items(vec![ @@ -34,6 +33,13 @@ impl ThemeSelector { } } +impl ThemeSelector { + pub fn new(id: impl Into) -> Self { + Self { id: id.into() } + } +} + +use gpui::{Div, RenderOnce}; #[cfg(feature = "stories")] pub use stories::*; @@ -47,7 +53,7 @@ mod stories { pub struct ThemeSelectorStory; - impl Render for ThemeSelectorStory { + impl Render for ThemeSelectorStory { type Element = Div; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { diff --git a/crates/ui2/src/to_extract/title_bar.rs b/crates/ui2/src/to_extract/title_bar.rs index 1a106cbf7a..167d8ca0bd 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::{Div, Render, RenderOnce, View, VisualContext}; use crate::prelude::*; use crate::settings::user_settings; @@ -85,7 +85,7 @@ impl TitleBar { } } -impl Render for TitleBar { +impl Render for TitleBar { type Element = Div; fn render(&mut self, cx: &mut ViewContext) -> Div { @@ -205,7 +205,7 @@ mod stories { } } - impl Render for TitleBarStory { + impl Render for TitleBarStory { type Element = Div; fn render(&mut self, cx: &mut ViewContext) -> Div { diff --git a/crates/ui2/src/to_extract/toolbar.rs b/crates/ui2/src/to_extract/toolbar.rs index b7738ffb1c..884a72d2c7 100644 --- a/crates/ui2/src/to_extract/toolbar.rs +++ b/crates/ui2/src/to_extract/toolbar.rs @@ -1,4 +1,4 @@ -use gpui::AnyElement; +use gpui::{AnyElement, Div, RenderOnce}; use smallvec::SmallVec; use crate::prelude::*; @@ -6,12 +6,26 @@ use crate::prelude::*; #[derive(Clone)] pub struct ToolbarItem {} -#[derive(Component)] +#[derive(RenderOnce)] pub struct Toolbar { left_items: SmallVec<[AnyElement; 2]>, right_items: SmallVec<[AnyElement; 2]>, } +impl Component for Toolbar { + type Rendered = Div; + + fn render(self, view: &mut V, cx: &mut ViewContext) -> Self::Rendered { + div() + .bg(cx.theme().colors().toolbar_background) + .p_2() + .flex() + .justify_between() + .child(div().flex().children(self.left_items)) + .child(div().flex().children(self.right_items)) + } +} + impl Toolbar { pub fn new() -> Self { Self { @@ -20,49 +34,39 @@ impl Toolbar { } } - pub fn left_item(mut self, child: impl Element) -> Self + pub fn left_item(mut self, child: impl RenderOnce) -> Self where Self: Sized, { - self.left_items.push(child.render()); + self.left_items.push(child.render_into_any()); self } - pub fn left_items(mut self, iter: impl IntoIterator>) -> Self + pub fn left_items(mut self, iter: impl IntoIterator>) -> Self where Self: Sized, { self.left_items - .extend(iter.into_iter().map(|item| item.render())); + .extend(iter.into_iter().map(|item| item.render_into_any())); self } - pub fn right_item(mut self, child: impl Element) -> Self + pub fn right_item(mut self, child: impl RenderOnce) -> Self where Self: Sized, { - self.right_items.push(child.render()); + self.right_items.push(child.render_into_any()); self } - pub fn right_items(mut self, iter: impl IntoIterator>) -> Self + pub fn right_items(mut self, iter: impl IntoIterator>) -> Self where Self: Sized, { self.right_items - .extend(iter.into_iter().map(|item| item.render())); + .extend(iter.into_iter().map(|item| item.render_into_any())); self } - - fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Element { - div() - .bg(cx.theme().colors().toolbar_background) - .p_2() - .flex() - .justify_between() - .child(div().flex().children(self.left_items)) - .child(div().flex().children(self.right_items)) - } } #[cfg(feature = "stories")] @@ -81,7 +85,7 @@ mod stories { pub struct ToolbarStory; - impl Render for ToolbarStory { + impl Render for ToolbarStory { type Element = Div; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { @@ -95,21 +99,21 @@ mod stories { vec![ Symbol(vec![ HighlightedText { - text: "impl ".to_string(), + text: "impl ".into(), color: cx.theme().syntax_color("keyword"), }, HighlightedText { - text: "ToolbarStory".to_string(), + text: "ToolbarStory".into(), color: cx.theme().syntax_color("function"), }, ]), Symbol(vec![ HighlightedText { - text: "fn ".to_string(), + text: "fn ".into(), color: cx.theme().syntax_color("keyword"), }, HighlightedText { - text: "render".to_string(), + text: "render".into(), color: cx.theme().syntax_color("function"), }, ]), diff --git a/crates/ui2/src/to_extract/traffic_lights.rs b/crates/ui2/src/to_extract/traffic_lights.rs index 8cab5594e6..5164e74159 100644 --- a/crates/ui2/src/to_extract/traffic_lights.rs +++ b/crates/ui2/src/to_extract/traffic_lights.rs @@ -7,21 +7,16 @@ enum TrafficLightColor { Green, } -#[derive(Component)] +#[derive(RenderOnce)] struct TrafficLight { color: TrafficLightColor, window_has_focus: bool, } -impl TrafficLight { - fn new(color: TrafficLightColor, window_has_focus: bool) -> Self { - Self { - color, - window_has_focus, - } - } +impl Component for TrafficLight { + type Rendered = Div; - fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Element { + fn render(self, view: &mut V, cx: &mut ViewContext) -> Self::Rendered { let system_colors = &cx.theme().styles.system; let fill = match (self.window_has_focus, self.color) { @@ -35,24 +30,24 @@ impl TrafficLight { } } -#[derive(Component)] +impl TrafficLight { + fn new(color: TrafficLightColor, window_has_focus: bool) -> Self { + Self { + color, + window_has_focus, + } + } +} + +#[derive(RenderOnce)] pub struct TrafficLights { window_has_focus: bool, } -impl TrafficLights { - pub fn new() -> Self { - Self { - window_has_focus: true, - } - } +impl Component for TrafficLights { + type Rendered = Div; - pub fn window_has_focus(mut self, window_has_focus: bool) -> Self { - self.window_has_focus = window_has_focus; - self - } - - fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Element { + fn render(self, view: &mut V, cx: &mut ViewContext) -> Self::Rendered { div() .flex() .items_center() @@ -72,6 +67,20 @@ impl TrafficLights { } } +impl TrafficLights { + pub fn new() -> Self { + Self { + window_has_focus: true, + } + } + + pub fn window_has_focus(mut self, window_has_focus: bool) -> Self { + self.window_has_focus = window_has_focus; + self + } +} + +use gpui::{Div, RenderOnce}; #[cfg(feature = "stories")] pub use stories::*; @@ -85,7 +94,7 @@ mod stories { pub struct TrafficLightsStory; - impl Render for TrafficLightsStory { + impl Render for TrafficLightsStory { type Element = Div; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { diff --git a/crates/ui2/src/to_extract/workspace.rs b/crates/ui2/src/to_extract/workspace.rs index 0451a9d032..f31009cbb5 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, Div, Render, RenderOnce, Size, View, VisualContext}; use settings2::Settings; use theme2::ThemeSettings; @@ -191,7 +191,7 @@ impl Workspace { } } -impl Render for Workspace { +impl Render for Workspace { type Element = Div; fn render(&mut self, cx: &mut ViewContext) -> Div { @@ -388,7 +388,7 @@ mod stories { } } - impl Render for WorkspaceStory { + impl Render for WorkspaceStory { type Element = Div; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { diff --git a/crates/workspace2/src/dock.rs b/crates/workspace2/src/dock.rs index 9603875aed..406a7a33d1 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, px, Action, AnchorCorner, AnyView, AppContext, Component, Div, Entity, EntityId, - EventEmitter, FocusHandle, FocusableView, ParentComponent, Render, SharedString, Styled, + EventEmitter, FocusHandle, FocusableView, ParentElement, Render, SharedString, Styled, Subscription, View, ViewContext, VisualContext, WeakView, WindowContext, }; use schemars::JsonSchema; diff --git a/crates/workspace2/src/status_bar.rs b/crates/workspace2/src/status_bar.rs index 327e7c09ed..b0f905f845 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, ParentComponent, Render, Styled, Subscription, View, ViewContext, - WindowContext, + div, AnyView, Component, Div, ParentElement, Render, Styled, Subscription, View, + ViewContext, WindowContext, }; use theme2::ActiveTheme; use ui::h_stack; diff --git a/crates/workspace2/src/workspace2.rs b/crates/workspace2/src/workspace2.rs index 08d248f6f2..af61091ce4 100644 --- a/crates/workspace2/src/workspace2.rs +++ b/crates/workspace2/src/workspace2.rs @@ -31,10 +31,10 @@ use futures::{ use gpui::{ actions, div, point, size, Action, AnyModel, AnyView, AnyWeakView, AppContext, AsyncAppContext, AsyncWindowContext, Bounds, Context, Div, Entity, EntityId, EventEmitter, FocusHandle, - FocusableView, GlobalPixels, InteractiveComponent, KeyContext, ManagedView, Model, - ModelContext, ParentComponent, PathPromptOptions, Point, PromptLevel, Render, Size, Styled, - Subscription, Task, View, ViewContext, VisualContext, WeakView, WindowBounds, WindowContext, - WindowHandle, WindowOptions, + FocusableView, GlobalPixels, InteractiveElement, KeyContext, ManagedView, Model, ModelContext, + ParentElement, PathPromptOptions, Point, PromptLevel, Render, Size, Styled, Subscription, Task, + View, ViewContext, VisualContext, WeakView, WindowBounds, WindowContext, WindowHandle, + WindowOptions, }; use item::{FollowableItem, FollowableItemHandle, Item, ItemHandle, ItemSettings, ProjectItem}; use itertools::Itertools; From 0673606de86715e4fb2d965cbb9c07b2c6af55b7 Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Sat, 18 Nov 2023 20:22:43 -0700 Subject: [PATCH 08/20] WIP --- crates/editor2/src/editor.rs | 2 +- crates/editor2/src/element.rs | 10 ++++++---- crates/storybook3/src/storybook3.rs | 2 +- crates/workspace2/src/dock.rs | 10 +++++----- crates/workspace2/src/modal_layer.rs | 2 +- crates/workspace2/src/notifications.rs | 4 ++-- crates/workspace2/src/pane.rs | 10 +++++----- crates/workspace2/src/pane_group.rs | 18 ++++++++++-------- crates/workspace2/src/status_bar.rs | 10 +++++----- crates/workspace2/src/toolbar.rs | 4 ++-- crates/workspace2/src/workspace2.rs | 2 +- 11 files changed, 39 insertions(+), 35 deletions(-) diff --git a/crates/editor2/src/editor.rs b/crates/editor2/src/editor.rs index 214c46551f..b241b76184 100644 --- a/crates/editor2/src/editor.rs +++ b/crates/editor2/src/editor.rs @@ -9376,7 +9376,7 @@ impl FocusableView for Editor { } } -impl Render for Editor { +impl Render for Editor { type Element = EditorElement; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { diff --git a/crates/editor2/src/element.rs b/crates/editor2/src/element.rs index 0ee710da47..3140008bc3 100644 --- a/crates/editor2/src/element.rs +++ b/crates/editor2/src/element.rs @@ -21,7 +21,7 @@ use gpui::{ div, point, px, relative, size, transparent_black, Action, AnyElement, AvailableSpace, BorrowWindow, Bounds, Component, ContentMask, Corners, DispatchPhase, Edges, Element, ElementId, ElementInputHandler, Entity, EntityId, Hsla, InteractiveElement, LineLayout, - MouseButton, MouseDownEvent, MouseMoveEvent, MouseUpEvent, ParentElement, Pixels, + MouseButton, MouseDownEvent, MouseMoveEvent, MouseUpEvent, ParentElement, Pixels, RenderOnce, ScrollWheelEvent, ShapedLine, SharedString, Size, StatefulInteractiveElement, Style, Styled, TextRun, TextStyle, View, ViewContext, WindowContext, WrappedLine, }; @@ -2466,9 +2466,11 @@ impl Element for EditorElement { } } -impl Component for EditorElement { - fn render(self) -> AnyElement { - AnyElement::new(self) +impl RenderOnce for EditorElement { + type Element = Self; + + fn render_once(self) -> Self::Element { + self } } diff --git a/crates/storybook3/src/storybook3.rs b/crates/storybook3/src/storybook3.rs index 291f8ce2ac..e8f1827e01 100644 --- a/crates/storybook3/src/storybook3.rs +++ b/crates/storybook3/src/storybook3.rs @@ -59,7 +59,7 @@ struct TestView { story: AnyView, } -impl Render for TestView { +impl Render for TestView { type Element = Div; fn render(&mut self, _cx: &mut ViewContext) -> Self::Element { diff --git a/crates/workspace2/src/dock.rs b/crates/workspace2/src/dock.rs index 406a7a33d1..d6b8d9ae79 100644 --- a/crates/workspace2/src/dock.rs +++ b/crates/workspace2/src/dock.rs @@ -1,8 +1,8 @@ use crate::{status_bar::StatusItemView, Axis, Workspace}; use gpui::{ div, px, Action, AnchorCorner, AnyView, AppContext, Component, Div, Entity, EntityId, - EventEmitter, FocusHandle, FocusableView, ParentElement, Render, SharedString, Styled, - Subscription, View, ViewContext, VisualContext, WeakView, WindowContext, + EventEmitter, FocusHandle, FocusableView, ParentElement, Render, RenderOnce, SharedString, + Styled, Subscription, View, ViewContext, VisualContext, WeakView, WindowContext, }; use schemars::JsonSchema; use serde::{Deserialize, Serialize}; @@ -426,7 +426,7 @@ impl Dock { } } -impl Render for Dock { +impl Render for Dock { type Element = Div; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { @@ -612,7 +612,7 @@ impl PanelButtons { // } // here be kittens -impl Render for PanelButtons { +impl Render for PanelButtons { type Element = Div; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { @@ -706,7 +706,7 @@ pub mod test { } } - impl Render for TestPanel { + impl Render for TestPanel { type Element = Div; fn render(&mut self, _cx: &mut ViewContext) -> Self::Element { diff --git a/crates/workspace2/src/modal_layer.rs b/crates/workspace2/src/modal_layer.rs index 8afd8317f9..3cbd8458f4 100644 --- a/crates/workspace2/src/modal_layer.rs +++ b/crates/workspace2/src/modal_layer.rs @@ -71,7 +71,7 @@ impl ModalLayer { } } -impl Render for ModalLayer { +impl Render for ModalLayer { type Element = Div; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { diff --git a/crates/workspace2/src/notifications.rs b/crates/workspace2/src/notifications.rs index 7277cc6fc4..bb00973d5c 100644 --- a/crates/workspace2/src/notifications.rs +++ b/crates/workspace2/src/notifications.rs @@ -13,7 +13,7 @@ pub enum NotificationEvent { Dismiss, } -pub trait Notification: EventEmitter + Render {} +pub trait Notification: EventEmitter + Render {} pub trait NotificationHandle: Send { fn id(&self) -> EntityId; @@ -251,7 +251,7 @@ pub mod simple_message_notification { // } } - impl Render for MessageNotification { + impl Render for MessageNotification { type Element = Div; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { diff --git a/crates/workspace2/src/pane.rs b/crates/workspace2/src/pane.rs index d44d347114..4ab78d8bca 100644 --- a/crates/workspace2/src/pane.rs +++ b/crates/workspace2/src/pane.rs @@ -593,7 +593,7 @@ impl Pane { self.items.iter() } - pub fn items_of_type(&self) -> impl '_ + Iterator> { + pub fn items_of_type>(&self) -> impl '_ + Iterator> { self.items .iter() .filter_map(|item| item.to_any().downcast().ok()) @@ -1343,7 +1343,7 @@ impl Pane { item: &Box, detail: usize, cx: &mut ViewContext<'_, Pane>, - ) -> impl Component { + ) -> impl RenderOnce { let label = item.tab_content(Some(detail), cx); let close_icon = || { let id = item.item_id(); @@ -1436,7 +1436,7 @@ impl Pane { ) } - fn render_tab_bar(&mut self, cx: &mut ViewContext<'_, Pane>) -> impl Component { + fn render_tab_bar(&mut self, cx: &mut ViewContext<'_, Pane>) -> impl RenderOnce { div() .group("tab_bar") .id("tab_bar") @@ -1895,7 +1895,7 @@ impl FocusableView for Pane { } } -impl Render for Pane { +impl Render for Pane { type Element = Focusable>; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { @@ -2949,7 +2949,7 @@ struct DraggedTab { title: String, } -impl Render for DraggedTab { +impl Render for DraggedTab { type Element = Div; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { diff --git a/crates/workspace2/src/pane_group.rs b/crates/workspace2/src/pane_group.rs index d46757ff9f..68f26295dc 100644 --- a/crates/workspace2/src/pane_group.rs +++ b/crates/workspace2/src/pane_group.rs @@ -6,7 +6,10 @@ use db2::sqlez::{ bindable::{Bind, Column, StaticColumnCount}, statement::Statement, }; -use gpui::{point, size, AnyElement, AnyWeakView, Bounds, Model, Pixels, Point, View, ViewContext}; +use gpui::{ + point, size, AnyElement, AnyWeakView, Bounds, Div, Model, Pixels, Point, RenderOnce, View, + ViewContext, +}; use parking_lot::Mutex; use project2::Project; use serde::Deserialize; @@ -130,7 +133,7 @@ impl PaneGroup { zoomed: Option<&AnyWeakView>, app_state: &Arc, cx: &mut ViewContext, - ) -> impl Component { + ) -> impl RenderOnce { self.root.render( project, 0, @@ -202,7 +205,7 @@ impl Member { zoomed: Option<&AnyWeakView>, app_state: &Arc, cx: &mut ViewContext, - ) -> impl Component { + ) -> impl RenderOnce { match self { Member::Pane(pane) => { // todo!() @@ -212,7 +215,7 @@ impl Member { // Some(pane) // }; - div().size_full().child(pane.clone()).render() + div().size_full().child(pane.clone()) // Stack::new() // .with_child(pane_element.contained().with_border(leader_border)) @@ -559,7 +562,7 @@ impl PaneAxis { zoomed: Option<&AnyWeakView>, app_state: &Arc, cx: &mut ViewContext, - ) -> AnyElement { + ) -> Div { debug_assert!(self.members.len() == self.flexes.lock().len()); div() @@ -582,11 +585,10 @@ impl PaneAxis { app_state, cx, ) - .render(), - Member::Pane(pane) => pane.clone().render(), + .render_into_any(), + Member::Pane(pane) => pane.clone().render_into_any(), } })) - .render() // let mut pane_axis = PaneAxisElement::new( // self.axis, diff --git a/crates/workspace2/src/status_bar.rs b/crates/workspace2/src/status_bar.rs index b0f905f845..f961cac8f0 100644 --- a/crates/workspace2/src/status_bar.rs +++ b/crates/workspace2/src/status_bar.rs @@ -2,14 +2,14 @@ use std::any::TypeId; use crate::{ItemHandle, Pane}; use gpui::{ - div, AnyView, Component, Div, ParentElement, Render, Styled, Subscription, View, + div, AnyView, Component, Div, ParentElement, Render, RenderOnce, Styled, Subscription, View, ViewContext, WindowContext, }; use theme2::ActiveTheme; use ui::h_stack; use util::ResultExt; -pub trait StatusItemView: Render { +pub trait StatusItemView: Render { fn set_active_pane_item( &mut self, active_pane_item: Option<&dyn crate::ItemHandle>, @@ -34,7 +34,7 @@ pub struct StatusBar { _observe_active_pane: Subscription, } -impl Render for StatusBar { +impl Render for StatusBar { type Element = Div; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { @@ -53,14 +53,14 @@ impl Render for StatusBar { } impl StatusBar { - fn render_left_tools(&self, cx: &mut ViewContext) -> impl Component { + fn render_left_tools(&self, cx: &mut ViewContext) -> impl RenderOnce { h_stack() .items_center() .gap_1() .children(self.left_items.iter().map(|item| item.to_any())) } - fn render_right_tools(&self, cx: &mut ViewContext) -> impl Component { + fn render_right_tools(&self, cx: &mut ViewContext) -> impl RenderOnce { h_stack() .items_center() .gap_2() diff --git a/crates/workspace2/src/toolbar.rs b/crates/workspace2/src/toolbar.rs index 1d67da06b2..072c67fda8 100644 --- a/crates/workspace2/src/toolbar.rs +++ b/crates/workspace2/src/toolbar.rs @@ -7,7 +7,7 @@ pub enum ToolbarItemEvent { ChangeLocation(ToolbarItemLocation), } -pub trait ToolbarItemView: Render + EventEmitter { +pub trait ToolbarItemView: Render + EventEmitter { fn set_active_pane_item( &mut self, active_pane_item: Option<&dyn crate::ItemHandle>, @@ -51,7 +51,7 @@ pub struct Toolbar { items: Vec<(Box, ToolbarItemLocation)>, } -impl Render for Toolbar { +impl Render for Toolbar { type Element = Div; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { diff --git a/crates/workspace2/src/workspace2.rs b/crates/workspace2/src/workspace2.rs index af61091ce4..e6b3f1875f 100644 --- a/crates/workspace2/src/workspace2.rs +++ b/crates/workspace2/src/workspace2.rs @@ -3592,7 +3592,7 @@ impl FocusableView for Workspace { } } -impl Render for Workspace { +impl Render for Workspace { type Element = Div; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { From 33cd6f520a32a271963d818794169d9e14858ef9 Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Sat, 18 Nov 2023 21:51:47 -0700 Subject: [PATCH 09/20] Clean compile with redesigned element traits --- crates/collab_ui2/src/collab_panel.rs | 2 +- crates/collab_ui2/src/collab_titlebar_item.rs | 4 +- .../command_palette2/src/command_palette.rs | 4 +- crates/editor2/src/editor.rs | 35 ++--- crates/editor2/src/editor_tests.rs | 2 +- crates/editor2/src/element.rs | 39 +++--- crates/file_finder2/src/file_finder.rs | 7 +- crates/go_to_line2/src/go_to_line.rs | 2 +- crates/gpui2/src/element.rs | 130 ++++++++++++------ crates/gpui2/src/elements/div.rs | 24 ++-- crates/gpui2/src/elements/img.rs | 8 +- crates/gpui2/src/elements/overlay.rs | 8 +- crates/gpui2/src/elements/svg.rs | 8 +- crates/gpui2/src/elements/text.rs | 32 ++--- crates/gpui2/src/elements/uniform_list.rs | 8 +- crates/gpui2/src/view.rs | 24 ++-- crates/gpui2_macros/src/derive_render_once.rs | 4 + crates/picker2/src/picker2.rs | 8 +- crates/project_panel2/src/project_panel.rs | 8 +- crates/storybook2/src/stories/colors.rs | 4 +- crates/storybook2/src/stories/focus.rs | 2 +- crates/storybook2/src/stories/kitchen_sink.rs | 2 +- crates/storybook2/src/stories/picker.rs | 9 +- crates/storybook2/src/stories/scroll.rs | 2 +- crates/storybook2/src/stories/text.rs | 6 +- crates/storybook2/src/stories/z_index.rs | 24 ++-- crates/storybook2/src/storybook2.rs | 2 +- crates/terminal_view2/src/terminal_panel.rs | 2 +- crates/terminal_view2/src/terminal_view.rs | 10 +- crates/ui2/src/components/context_menu.rs | 31 ++--- crates/ui2/src/components/divider.rs | 21 ++- crates/workspace2/src/dock.rs | 9 +- crates/workspace2/src/pane.rs | 6 +- crates/workspace2/src/pane_group.rs | 3 +- crates/workspace2/src/status_bar.rs | 4 +- 35 files changed, 278 insertions(+), 216 deletions(-) diff --git a/crates/collab_ui2/src/collab_panel.rs b/crates/collab_ui2/src/collab_panel.rs index 22f6dc9d88..901348d2e2 100644 --- a/crates/collab_ui2/src/collab_panel.rs +++ b/crates/collab_ui2/src/collab_panel.rs @@ -3294,7 +3294,7 @@ impl CollabPanel { // .with_width(size.x()) // } -impl Render for CollabPanel { +impl Render for CollabPanel { type Element = Focusable>; fn render(&mut self, _cx: &mut ViewContext) -> Self::Element { diff --git a/crates/collab_ui2/src/collab_titlebar_item.rs b/crates/collab_ui2/src/collab_titlebar_item.rs index 570ff9f45e..42800269c7 100644 --- a/crates/collab_ui2/src/collab_titlebar_item.rs +++ b/crates/collab_ui2/src/collab_titlebar_item.rs @@ -31,7 +31,7 @@ use std::sync::Arc; use call::ActiveCall; use client::{Client, UserStore}; use gpui::{ - div, px, rems, AppContext, Component, Div, InteractiveElement, Model, ParentElement, Render, + div, px, rems, AppContext, Div, InteractiveElement, Model, ParentElement, Render, RenderOnce, Stateful, StatefulInteractiveElement, Styled, Subscription, ViewContext, VisualContext, WeakView, WindowBounds, }; @@ -81,7 +81,7 @@ pub struct CollabTitlebarItem { _subscriptions: Vec, } -impl Render for CollabTitlebarItem { +impl Render for CollabTitlebarItem { type Element = Stateful>; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { diff --git a/crates/command_palette2/src/command_palette.rs b/crates/command_palette2/src/command_palette.rs index 7e4994638e..cf3be8379a 100644 --- a/crates/command_palette2/src/command_palette.rs +++ b/crates/command_palette2/src/command_palette.rs @@ -1,7 +1,7 @@ use collections::{CommandPaletteFilter, HashMap}; use fuzzy::{StringMatch, StringMatchCandidate}; use gpui::{ - actions, div, prelude::*, Action, AppContext, Component, Dismiss, Div, FocusHandle, Keystroke, + actions, div, prelude::*, Action, AppContext, Dismiss, Div, FocusHandle, Keystroke, ManagedView, ParentElement, Render, Styled, View, ViewContext, VisualContext, WeakView, }; use picker::{Picker, PickerDelegate}; @@ -74,7 +74,7 @@ impl ManagedView for CommandPalette { } } -impl Render for CommandPalette { +impl Render for CommandPalette { type Element = Div; fn render(&mut self, _cx: &mut ViewContext) -> Self::Element { diff --git a/crates/editor2/src/editor.rs b/crates/editor2/src/editor.rs index b241b76184..6e9f0f0b6e 100644 --- a/crates/editor2/src/editor.rs +++ b/crates/editor2/src/editor.rs @@ -42,9 +42,9 @@ use gpui::{ actions, div, point, prelude::*, px, relative, rems, size, uniform_list, Action, AnyElement, AppContext, AsyncWindowContext, BackgroundExecutor, Bounds, ClipboardItem, Component, Context, EventEmitter, FocusHandle, FocusableView, FontFeatures, FontStyle, FontWeight, HighlightStyle, - Hsla, InputHandler, KeyContext, Model, MouseButton, ParentElement, Pixels, Render, Styled, - Subscription, Task, TextStyle, UniformListScrollHandle, View, ViewContext, VisualContext, - WeakView, WindowContext, + Hsla, InputHandler, KeyContext, Model, MouseButton, ParentElement, Pixels, Render, + SharedString, Styled, Subscription, Task, TextStyle, UniformListScrollHandle, View, + ViewContext, VisualContext, WeakView, WindowContext, }; use highlight_matching_bracket::refresh_matching_bracket_highlights; use hover_popover::{hide_hover, HoverState}; @@ -1580,7 +1580,8 @@ impl CodeActionsMenu { ) .map(|task| task.detach_and_log_err(cx)); }) - .child(action.lsp_action.title.clone()) + // TASK: It would be good to make lsp_action.title a SharedString to avoid allocating here. + .child(SharedString::from(action.lsp_action.title.clone())) }) .collect() }, @@ -1595,7 +1596,7 @@ impl CodeActionsMenu { .max_by_key(|(_, action)| action.lsp_action.title.chars().count()) .map(|(ix, _)| ix), ) - .render_once(); + .render_into_any(); if self.deployed_from_indicator { *cursor_position.column_mut() = 0; @@ -4353,19 +4354,19 @@ impl Editor { style: &EditorStyle, is_active: bool, cx: &mut ViewContext, - ) -> Option> { + ) -> Option> { if self.available_code_actions.is_some() { Some( - IconButton::new("code_actions_indicator", ui::Icon::Bolt) - .on_click(|editor: &mut Editor, cx| { + IconButton::new("code_actions_indicator", ui::Icon::Bolt).on_click( + |editor: &mut Editor, cx| { editor.toggle_code_actions( &ToggleCodeActions { deployed_from_indicator: true, }, cx, ); - }) - .into_any(), + }, + ), ) } else { None @@ -4380,7 +4381,7 @@ impl Editor { line_height: Pixels, gutter_margin: Pixels, cx: &mut ViewContext, - ) -> Vec>> { + ) -> Vec>> { fold_data .iter() .enumerate() @@ -4392,16 +4393,16 @@ impl Editor { FoldStatus::Folded => ui::Icon::ChevronRight, FoldStatus::Foldable => ui::Icon::ChevronDown, }; - IconButton::new(ix as usize, icon) - .on_click(move |editor: &mut Editor, cx| match fold_status { + IconButton::new(ix as usize, icon).on_click( + move |editor: &mut Editor, cx| match fold_status { FoldStatus::Folded => { editor.unfold_at(&UnfoldAt { buffer_row }, cx); } FoldStatus::Foldable => { editor.fold_at(&FoldAt { buffer_row }, cx); } - }) - .into_any() + }, + ) }) }) .flatten() @@ -7792,7 +7793,7 @@ impl Editor { cx.editor_style.diagnostic_style.clone(), }, ))) - .render_once() + .render_into_any() } }), disposition: BlockDisposition::Below, @@ -9994,7 +9995,7 @@ pub fn diagnostic_block_renderer(diagnostic: Diagnostic, is_valid: bool) -> Rend cx.write_to_clipboard(ClipboardItem::new(message.clone())); }) .tooltip(|_, cx| Tooltip::text("Copy diagnostic message", cx)) - .render_once() + .render_into_any() }) } diff --git a/crates/editor2/src/editor_tests.rs b/crates/editor2/src/editor_tests.rs index f23618aa21..e27f13cd59 100644 --- a/crates/editor2/src/editor_tests.rs +++ b/crates/editor2/src/editor_tests.rs @@ -3048,7 +3048,7 @@ fn test_move_line_up_down_with_blocks(cx: &mut TestAppContext) { position: snapshot.anchor_after(Point::new(2, 0)), disposition: BlockDisposition::Below, height: 1, - render: Arc::new(|_| div().render_once()), + render: Arc::new(|_| div().into_any()), }], Some(Autoscroll::fit()), cx, diff --git a/crates/editor2/src/element.rs b/crates/editor2/src/element.rs index 3140008bc3..a207e064c5 100644 --- a/crates/editor2/src/element.rs +++ b/crates/editor2/src/element.rs @@ -490,6 +490,7 @@ impl EditorElement { for (ix, fold_indicator) in layout.fold_indicators.drain(..).enumerate() { if let Some(mut fold_indicator) = fold_indicator { + let mut fold_indicator = fold_indicator.render_into_any(); let available_space = size( AvailableSpace::MinContent, AvailableSpace::Definite(line_height * 0.55), @@ -509,20 +510,21 @@ impl EditorElement { } } - if let Some(mut indicator) = layout.code_actions_indicator.take() { + if let Some(indicator) = layout.code_actions_indicator.take() { + let mut button = indicator.button.render_into_any(); let available_space = size( AvailableSpace::MinContent, AvailableSpace::Definite(line_height), ); - let indicator_size = indicator.element.measure(available_space, editor, cx); + let indicator_size = button.measure(available_space, editor, cx); + let mut x = Pixels::ZERO; let mut y = indicator.row as f32 * line_height - scroll_top; // Center indicator. x += ((layout.gutter_padding + layout.gutter_margin) - indicator_size.width) / 2.; y += (line_height - indicator_size.height) / 2.; - indicator - .element - .draw(bounds.origin + point(x, y), available_space, editor, cx); + + button.draw(bounds.origin + point(x, y), available_space, editor, cx); } } @@ -1810,7 +1812,7 @@ impl EditorElement { .render_code_actions_indicator(&style, active, cx) .map(|element| CodeActionsIndicator { row: newest_selection_head.row(), - element, + button: element, }); } } @@ -2041,14 +2043,19 @@ impl EditorElement { // Can't use .and_then() because `.file_name()` and `.parent()` return references :( if let Some(path) = path { filename = path.file_name().map(|f| f.to_string_lossy().to_string()); - parent_path = - path.parent().map(|p| p.to_string_lossy().to_string() + "/"); + parent_path = path + .parent() + .map(|p| SharedString::from(p.to_string_lossy().to_string() + "/")); } h_stack() .size_full() .bg(gpui::red()) - .child(filename.unwrap_or_else(|| "untitled".to_string())) + .child( + filename + .map(SharedString::from) + .unwrap_or_else(|| "untitled".into()), + ) .children(parent_path) .children(jump_icon) // .p_x(gutter_padding) } else { @@ -2059,7 +2066,7 @@ impl EditorElement { .child("⋯") .children(jump_icon) // .p_x(gutter_padding) }; - element.render() + element.into_any() } }; @@ -2391,10 +2398,6 @@ enum Invisible { impl Element for EditorElement { type State = (); - fn element_id(&self) -> Option { - Some(self.editor_id.into()) - } - fn layout( &mut self, editor: &mut Editor, @@ -2469,6 +2472,10 @@ impl Element for EditorElement { impl RenderOnce for EditorElement { type Element = Self; + fn element_id(&self) -> Option { + Some(self.editor_id.into()) + } + fn render_once(self) -> Self::Element { self } @@ -3098,14 +3105,14 @@ pub struct LayoutState { context_menu: Option<(DisplayPoint, AnyElement)>, code_actions_indicator: Option, // hover_popovers: Option<(DisplayPoint, Vec>)>, - fold_indicators: Vec>>, + fold_indicators: Vec>>, tab_invisible: ShapedLine, space_invisible: ShapedLine, } struct CodeActionsIndicator { row: u32, - element: AnyElement, + button: IconButton, } struct PositionMap { diff --git a/crates/file_finder2/src/file_finder.rs b/crates/file_finder2/src/file_finder.rs index 3488b6916c..77bc14fa96 100644 --- a/crates/file_finder2/src/file_finder.rs +++ b/crates/file_finder2/src/file_finder.rs @@ -2,9 +2,8 @@ use collections::HashMap; use editor::{scroll::autoscroll::Autoscroll, Bias, Editor}; use fuzzy::{CharBag, PathMatch, PathMatchCandidate}; use gpui::{ - actions, div, AppContext, Component, Dismiss, Div, FocusHandle, InteractiveElement, - ManagedView, Model, ParentElement, Render, Styled, Task, View, ViewContext, VisualContext, - WeakView, + actions, div, AppContext, Dismiss, Div, FocusHandle, InteractiveElement, ManagedView, Model, + ParentElement, Render, RenderOnce, Styled, Task, View, ViewContext, VisualContext, WeakView, }; use picker::{Picker, PickerDelegate}; use project::{PathMatchCandidateSet, Project, ProjectPath, WorktreeId}; @@ -116,7 +115,7 @@ impl ManagedView for FileFinder { self.picker.focus_handle(cx) } } -impl Render for FileFinder { +impl Render for FileFinder { type Element = Div; fn render(&mut self, _cx: &mut ViewContext) -> Self::Element { diff --git a/crates/go_to_line2/src/go_to_line.rs b/crates/go_to_line2/src/go_to_line.rs index 26641bfa09..81e1d990f1 100644 --- a/crates/go_to_line2/src/go_to_line.rs +++ b/crates/go_to_line2/src/go_to_line.rs @@ -143,7 +143,7 @@ impl GoToLine { } } -impl Render for GoToLine { +impl Render for GoToLine { type Element = Div; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { diff --git a/crates/gpui2/src/element.rs b/crates/gpui2/src/element.rs index c60c902e25..990de68b06 100644 --- a/crates/gpui2/src/element.rs +++ b/crates/gpui2/src/element.rs @@ -14,12 +14,50 @@ pub trait Render: 'static + Sized { pub trait RenderOnce: Sized { type Element: Element + 'static; + fn element_id(&self) -> Option; + fn render_once(self) -> Self::Element; fn render_into_any(self) -> AnyElement { self.render_once().into_any() } + fn draw( + self, + origin: Point, + available_space: Size, + view_state: &mut V, + cx: &mut ViewContext, + f: impl FnOnce(&mut >::State, &mut ViewContext) -> R, + ) -> R + where + T: Clone + Default + Debug + Into, + { + let element = self.render_once(); + let element_id = element.element_id(); + let element = DrawableElement { + element: Some(element), + phase: ElementDrawPhase::Start, + }; + let frame_state = DrawableElement::draw( + element, + origin, + available_space.map(Into::into), + view_state, + cx, + ); + + if let Some(mut frame_state) = frame_state { + f(&mut frame_state, cx) + } else { + cx.with_element_state(element_id.unwrap(), |element_state, cx| { + let mut element_state = element_state.unwrap(); + let result = f(&mut element_state, cx); + (result, element_state) + }) + } + } + fn map(self, f: impl FnOnce(Self) -> U) -> U where Self: Sized, @@ -52,8 +90,6 @@ pub trait RenderOnce: Sized { pub trait Element: 'static + RenderOnce { type State: 'static; - fn element_id(&self) -> Option; - fn layout( &mut self, view_state: &mut V, @@ -72,35 +108,6 @@ pub trait Element: 'static + RenderOnce { fn into_any(self) -> AnyElement { AnyElement::new(self) } - - fn draw( - self, - origin: Point, - available_space: Size, - view_state: &mut V, - cx: &mut ViewContext, - f: impl FnOnce(&mut Self::State, &mut ViewContext) -> R, - ) -> R - where - T: Clone + Default + Debug + Into, - { - let element_id = self.element_id(); - let element = DrawableElement { - element: Some(self), - phase: ElementDrawPhase::Start, - }; - let frame_state = element.draw(origin, available_space.map(Into::into), view_state, cx); - - if let Some(mut frame_state) = frame_state { - f(&mut frame_state, cx) - } else { - cx.with_element_state(element_id.unwrap(), |element_state, cx| { - let mut element_state = element_state.unwrap(); - let result = f(&mut element_state, cx); - (result, element_state) - }) - } - } } pub trait Component: 'static { @@ -131,10 +138,6 @@ impl CompositeElement { impl> Element for CompositeElement { type State = CompositeElementState; - fn element_id(&self) -> Option { - None - } - fn layout( &mut self, view: &mut V, @@ -174,6 +177,10 @@ impl> Element for CompositeElement { impl> RenderOnce for CompositeElement { type Element = Self; + fn element_id(&self) -> Option { + None + } + fn render_once(self) -> Self::Element { self } @@ -231,23 +238,21 @@ pub struct DrawableElement> { } #[derive(Default)] -enum ElementDrawPhase { +enum ElementDrawPhase { #[default] Start, LayoutRequested { layout_id: LayoutId, - frame_state: Option, + frame_state: Option, }, LayoutComputed { layout_id: LayoutId, available_space: Size, - frame_state: Option, + frame_state: Option, }, } -/// Internal struct that wraps an element to store Layout and ElementState after the element is rendered. -/// It's allocated as a trait object to erase the element type and wrapped in AnyElement for -/// improved usability. +/// A wrapper around an implementer of [Element] that allows it to be drawn in a window. impl> DrawableElement { fn new(element: E) -> Self { DrawableElement { @@ -379,6 +384,41 @@ impl> DrawableElement { } } +// impl> Element for DrawableElement { +// type State = >::State; + +// fn layout( +// &mut self, +// view_state: &mut V, +// element_state: Option, +// cx: &mut ViewContext, +// ) -> (LayoutId, Self::State) { + +// } + +// fn paint( +// self, +// bounds: Bounds, +// view_state: &mut V, +// element_state: &mut Self::State, +// cx: &mut ViewContext, +// ) { +// todo!() +// } +// } + +// impl> RenderOnce for DrawableElement { +// type Element = Self; + +// fn element_id(&self) -> Option { +// self.element.as_ref()?.element_id() +// } + +// fn render_once(self) -> Self::Element { +// self +// } +// } + impl ElementObject for Option> where E: Element, @@ -476,10 +516,6 @@ impl AnyElement { impl Element for AnyElement { type State = (); - fn element_id(&self) -> Option { - AnyElement::element_id(self) - } - fn layout( &mut self, view_state: &mut V, @@ -504,6 +540,10 @@ impl Element for AnyElement { impl RenderOnce for AnyElement { type Element = Self; + fn element_id(&self) -> Option { + AnyElement::element_id(self) + } + fn render_once(self) -> Self::Element { self } diff --git a/crates/gpui2/src/elements/div.rs b/crates/gpui2/src/elements/div.rs index 26de4ea25f..256791ed04 100644 --- a/crates/gpui2/src/elements/div.rs +++ b/crates/gpui2/src/elements/div.rs @@ -602,10 +602,6 @@ impl ParentElement for Div { impl Element for Div { type State = DivState; - fn element_id(&self) -> Option { - self.interactivity.element_id.clone() - } - fn layout( &mut self, view_state: &mut V, @@ -694,6 +690,10 @@ impl Element for Div { impl RenderOnce for Div { type Element = Self; + fn element_id(&self) -> Option { + self.interactivity.element_id.clone() + } + fn render_once(self) -> Self::Element { self } @@ -1293,10 +1293,6 @@ where { type State = E::State; - fn element_id(&self) -> Option { - self.element.element_id() - } - fn layout( &mut self, view_state: &mut V, @@ -1324,6 +1320,10 @@ where { type Element = Self; + fn element_id(&self) -> Option { + self.element.element_id() + } + fn render_once(self) -> Self::Element { self } @@ -1381,10 +1381,6 @@ where { type State = E::State; - fn element_id(&self) -> Option { - self.element.element_id() - } - fn layout( &mut self, view_state: &mut V, @@ -1412,6 +1408,10 @@ where { type Element = Self; + fn element_id(&self) -> Option { + self.element.element_id() + } + fn render_once(self) -> Self::Element { self } diff --git a/crates/gpui2/src/elements/img.rs b/crates/gpui2/src/elements/img.rs index 16f20869ab..b4c439d0cb 100644 --- a/crates/gpui2/src/elements/img.rs +++ b/crates/gpui2/src/elements/img.rs @@ -37,10 +37,6 @@ where impl Element for Img { type State = InteractiveElementState; - fn element_id(&self) -> Option { - self.interactivity.element_id.clone() - } - fn layout( &mut self, _view_state: &mut V, @@ -98,6 +94,10 @@ impl Element for Img { impl RenderOnce for Img { type Element = Self; + fn element_id(&self) -> Option { + self.interactivity.element_id.clone() + } + fn render_once(self) -> Self::Element { self } diff --git a/crates/gpui2/src/elements/overlay.rs b/crates/gpui2/src/elements/overlay.rs index 4e01b8aad1..79a3643bdc 100644 --- a/crates/gpui2/src/elements/overlay.rs +++ b/crates/gpui2/src/elements/overlay.rs @@ -60,10 +60,6 @@ impl ParentElement for Overlay { impl Element for Overlay { type State = OverlayState; - fn element_id(&self) -> Option { - None - } - fn layout( &mut self, view_state: &mut V, @@ -160,6 +156,10 @@ impl Element for Overlay { impl RenderOnce for Overlay { type Element = Self; + fn element_id(&self) -> Option { + None + } + fn render_once(self) -> Self::Element { self } diff --git a/crates/gpui2/src/elements/svg.rs b/crates/gpui2/src/elements/svg.rs index f6823c50d5..0940bdd1eb 100644 --- a/crates/gpui2/src/elements/svg.rs +++ b/crates/gpui2/src/elements/svg.rs @@ -26,10 +26,6 @@ impl Svg { impl Element for Svg { type State = InteractiveElementState; - fn element_id(&self) -> Option { - self.interactivity.element_id.clone() - } - fn layout( &mut self, _view_state: &mut V, @@ -62,6 +58,10 @@ impl Element for Svg { impl RenderOnce for Svg { type Element = Self; + fn element_id(&self) -> Option { + self.interactivity.element_id.clone() + } + fn render_once(self) -> Self::Element { self } diff --git a/crates/gpui2/src/elements/text.rs b/crates/gpui2/src/elements/text.rs index bfd63d3c3d..9c7cd35e25 100644 --- a/crates/gpui2/src/elements/text.rs +++ b/crates/gpui2/src/elements/text.rs @@ -11,10 +11,6 @@ use util::ResultExt; impl Element for &'static str { type State = TextState; - fn element_id(&self) -> Option { - None - } - fn layout( &mut self, _: &mut V, @@ -40,6 +36,10 @@ impl Element for &'static str { impl RenderOnce for &'static str { type Element = Self; + fn element_id(&self) -> Option { + None + } + fn render_once(self) -> Self::Element { self } @@ -48,10 +48,6 @@ impl RenderOnce for &'static str { impl Element for SharedString { type State = TextState; - fn element_id(&self) -> Option { - Some(self.clone().into()) - } - fn layout( &mut self, _: &mut V, @@ -78,6 +74,10 @@ impl Element for SharedString { impl RenderOnce for SharedString { type Element = Self; + fn element_id(&self) -> Option { + Some(self.clone().into()) + } + fn render_once(self) -> Self::Element { self } @@ -105,10 +105,6 @@ impl StyledText { impl Element for StyledText { type State = TextState; - fn element_id(&self) -> Option { - None - } - fn layout( &mut self, _view: &mut V, @@ -194,6 +190,10 @@ impl Element for StyledText { impl RenderOnce for StyledText { type Element = Self; + fn element_id(&self) -> Option { + None + } + fn render_once(self) -> Self::Element { self } @@ -300,10 +300,6 @@ struct InteractiveTextState { impl Element for InteractiveText { type State = InteractiveTextState; - fn element_id(&self) -> Option { - Some(self.id.clone()) - } - fn layout( &mut self, view_state: &mut V, @@ -346,6 +342,10 @@ impl Element for InteractiveText { impl RenderOnce for InteractiveText { type Element = Self; + fn element_id(&self) -> Option { + Some(self.id.clone()) + } + fn render_once(self) -> Self::Element { self } diff --git a/crates/gpui2/src/elements/uniform_list.rs b/crates/gpui2/src/elements/uniform_list.rs index 997904d913..caf18962ec 100644 --- a/crates/gpui2/src/elements/uniform_list.rs +++ b/crates/gpui2/src/elements/uniform_list.rs @@ -104,10 +104,6 @@ pub struct UniformListState { impl Element for UniformList { type State = UniformListState; - fn element_id(&self) -> Option { - Some(self.id.clone()) - } - fn layout( &mut self, view_state: &mut V, @@ -255,6 +251,10 @@ impl Element for UniformList { impl RenderOnce for UniformList { type Element = Self; + fn element_id(&self) -> Option { + Some(self.id.clone()) + } + fn render_once(self) -> Self::Element { self } diff --git a/crates/gpui2/src/view.rs b/crates/gpui2/src/view.rs index c32bc70e4a..6d6863b54b 100644 --- a/crates/gpui2/src/view.rs +++ b/crates/gpui2/src/view.rs @@ -208,10 +208,6 @@ impl> From> for AnyView { impl, ParentV: 'static> Element for View { type State = Option>; - fn element_id(&self) -> Option { - Some(self.model.entity_id.into()) - } - fn layout( &mut self, _parent_view: &mut ParentV, @@ -241,6 +237,10 @@ impl, ParentV: 'static> Element for View { impl, ParentV: 'static> RenderOnce for View { type Element = View; + fn element_id(&self) -> Option { + Some(self.model.entity_id.into()) + } + fn render_once(self) -> Self::Element { self } @@ -249,10 +249,6 @@ impl, ParentV: 'static> RenderOnce for View { impl Element for AnyView { type State = Option>; - fn element_id(&self) -> Option { - Some(self.model.entity_id.into()) - } - fn layout( &mut self, _view_state: &mut V, @@ -277,6 +273,10 @@ impl Element for AnyView { impl RenderOnce for AnyView { type Element = Self; + fn element_id(&self) -> Option { + Some(self.model.entity_id.into()) + } + fn render_once(self) -> Self::Element { self } @@ -334,10 +334,6 @@ where { type State = Option>; - fn element_id(&self) -> Option { - Some(self.view.entity_id().into()) - } - fn layout( &mut self, _: &mut ParentV, @@ -371,6 +367,10 @@ where { type Element = Self; + fn element_id(&self) -> Option { + self.element.as_ref().unwrap().element_id() + } + fn render_once(self) -> Self::Element { self } diff --git a/crates/gpui2_macros/src/derive_render_once.rs b/crates/gpui2_macros/src/derive_render_once.rs index ee01e22358..d1dcfc5dc1 100644 --- a/crates/gpui2_macros/src/derive_render_once.rs +++ b/crates/gpui2_macros/src/derive_render_once.rs @@ -33,6 +33,10 @@ pub fn derive_render_once(input: TokenStream) -> TokenStream { { type Element = gpui::CompositeElement<#view_type, Self>; + fn element_id(&self) -> Option { + None + } + fn render_once(self) -> Self::Element { gpui::CompositeElement::new(self) } diff --git a/crates/picker2/src/picker2.rs b/crates/picker2/src/picker2.rs index 3491fc3d4a..ef4ded65ea 100644 --- a/crates/picker2/src/picker2.rs +++ b/crates/picker2/src/picker2.rs @@ -1,7 +1,7 @@ use editor::Editor; use gpui::{ - div, prelude::*, uniform_list, AppContext, Component, Div, FocusHandle, FocusableView, - MouseButton, Render, Task, UniformListScrollHandle, View, ViewContext, WindowContext, + div, prelude::*, uniform_list, AppContext, Div, FocusHandle, FocusableView, MouseButton, + Render, Task, UniformListScrollHandle, View, ViewContext, WindowContext, }; use std::{cmp, sync::Arc}; use ui::{prelude::*, v_stack, Divider, Label, TextColor}; @@ -15,7 +15,7 @@ pub struct Picker { } pub trait PickerDelegate: Sized + 'static { - type ListItem: Component>; + type ListItem: RenderOnce>; fn match_count(&self) -> usize; fn selected_index(&self) -> usize; @@ -180,7 +180,7 @@ impl Picker { } } -impl Render for Picker { +impl Render for Picker { type Element = Div; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { diff --git a/crates/project_panel2/src/project_panel.rs b/crates/project_panel2/src/project_panel.rs index 46ad7a7a41..7fbb6cd553 100644 --- a/crates/project_panel2/src/project_panel.rs +++ b/crates/project_panel2/src/project_panel.rs @@ -9,9 +9,9 @@ use file_associations::FileAssociations; use anyhow::{anyhow, Result}; use gpui::{ actions, div, px, uniform_list, Action, AppContext, AssetSource, AsyncWindowContext, - ClipboardItem, Component, Div, EventEmitter, FocusHandle, Focusable, FocusableView, - InteractiveElement, Model, MouseButton, ParentElement, Pixels, Point, PromptLevel, Render, - Stateful, StatefulInteractiveElement, Styled, Task, UniformListScrollHandle, View, ViewContext, + ClipboardItem, Div, EventEmitter, FocusHandle, Focusable, FocusableView, InteractiveElement, + Model, MouseButton, ParentElement, Pixels, Point, PromptLevel, Render, RenderOnce, Stateful, + StatefulInteractiveElement, Styled, Task, UniformListScrollHandle, View, ViewContext, VisualContext as _, WeakView, WindowContext, }; use menu::{Confirm, SelectNext, SelectPrev}; @@ -1423,7 +1423,7 @@ impl ProjectPanel { } } -impl Render for ProjectPanel { +impl Render for ProjectPanel { type Element = Focusable>>; fn render(&mut self, _cx: &mut gpui::ViewContext) -> Self::Element { diff --git a/crates/storybook2/src/stories/colors.rs b/crates/storybook2/src/stories/colors.rs index 4f8c54fa6f..b690435e01 100644 --- a/crates/storybook2/src/stories/colors.rs +++ b/crates/storybook2/src/stories/colors.rs @@ -5,7 +5,7 @@ use ui::prelude::*; pub struct ColorsStory; -impl Render for ColorsStory { +impl Render for ColorsStory { type Element = Div; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { @@ -28,7 +28,7 @@ impl Render for ColorsStory { div() .w(px(75.)) .line_height(px(24.)) - .child(scale.name().to_string()), + .child(scale.name().clone()), ) .child( div() diff --git a/crates/storybook2/src/stories/focus.rs b/crates/storybook2/src/stories/focus.rs index 571882f1f2..12c7ea81a0 100644 --- a/crates/storybook2/src/stories/focus.rs +++ b/crates/storybook2/src/stories/focus.rs @@ -26,7 +26,7 @@ impl FocusStory { } } -impl Render for FocusStory { +impl Render for FocusStory { type Element = Focusable>>; fn render(&mut self, cx: &mut gpui::ViewContext) -> Self::Element { diff --git a/crates/storybook2/src/stories/kitchen_sink.rs b/crates/storybook2/src/stories/kitchen_sink.rs index 507aa8db2d..2d31cefed6 100644 --- a/crates/storybook2/src/stories/kitchen_sink.rs +++ b/crates/storybook2/src/stories/kitchen_sink.rs @@ -11,7 +11,7 @@ impl KitchenSinkStory { } } -impl Render for KitchenSinkStory { +impl Render for KitchenSinkStory { type Element = Stateful>; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { diff --git a/crates/storybook2/src/stories/picker.rs b/crates/storybook2/src/stories/picker.rs index a3f9ef5eb8..7c2412a02f 100644 --- a/crates/storybook2/src/stories/picker.rs +++ b/crates/storybook2/src/stories/picker.rs @@ -1,5 +1,7 @@ use fuzzy::StringMatchCandidate; -use gpui::{div, prelude::*, Div, KeyBinding, Render, Styled, Task, View, WindowContext}; +use gpui::{ + div, prelude::*, Div, KeyBinding, Render, SharedString, Styled, Task, View, WindowContext, +}; use picker::{Picker, PickerDelegate}; use std::sync::Arc; use theme2::ActiveTheme; @@ -54,7 +56,8 @@ impl PickerDelegate for Delegate { let Some(candidate_ix) = self.matches.get(ix) else { return div(); }; - let candidate = self.candidates[*candidate_ix].string.clone(); + // TASK: Make StringMatchCandidate::string a SharedString + let candidate = SharedString::from(self.candidates[*candidate_ix].string.clone()); div() .text_color(colors.text) @@ -202,7 +205,7 @@ impl PickerStory { } } -impl Render for PickerStory { +impl Render for PickerStory { type Element = Div; fn render(&mut self, cx: &mut gpui::ViewContext) -> Self::Element { diff --git a/crates/storybook2/src/stories/scroll.rs b/crates/storybook2/src/stories/scroll.rs index f1bb7b4e7c..bbab0b1d11 100644 --- a/crates/storybook2/src/stories/scroll.rs +++ b/crates/storybook2/src/stories/scroll.rs @@ -10,7 +10,7 @@ impl ScrollStory { } } -impl Render for ScrollStory { +impl Render for ScrollStory { type Element = Stateful>; fn render(&mut self, cx: &mut gpui::ViewContext) -> Self::Element { diff --git a/crates/storybook2/src/stories/text.rs b/crates/storybook2/src/stories/text.rs index 94c9d0d51f..722832c76a 100644 --- a/crates/storybook2/src/stories/text.rs +++ b/crates/storybook2/src/stories/text.rs @@ -1,6 +1,4 @@ -use gpui::{ - div, white, Div, ParentElement, Render, Styled, View, VisualContext, WindowContext, -}; +use gpui::{div, white, Div, ParentElement, Render, Styled, View, VisualContext, WindowContext}; pub struct TextStory; @@ -10,7 +8,7 @@ impl TextStory { } } -impl Render for TextStory { +impl Render for TextStory { type Element = Div; fn render(&mut self, cx: &mut gpui::ViewContext) -> Self::Element { diff --git a/crates/storybook2/src/stories/z_index.rs b/crates/storybook2/src/stories/z_index.rs index 4916f192b1..087ed913fd 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, Div, Hsla, Render, RenderOnce}; use ui::prelude::*; use crate::story::Story; @@ -7,7 +7,7 @@ use crate::story::Story; /// [https://developer.mozilla.org/en-US/docs/Web/CSS/z-index](https://developer.mozilla.org/en-US/docs/Web/CSS/z-index). pub struct ZIndexStory; -impl Render for ZIndexStory { +impl Render for ZIndexStory { type Element = Div; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { @@ -79,17 +79,15 @@ trait Styles: Styled + Sized { impl Styles for Div {} -// #[derive(RenderOnce)] +#[derive(RenderOnce)] struct ZIndexExample { z_index: u32, } -impl ZIndexExample { - pub fn new(z_index: u32) -> Self { - Self { z_index } - } +impl Component for ZIndexExample { + type Rendered = Div; - fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Element { + fn render(self, view: &mut V, cx: &mut ViewContext) -> Self::Rendered { div() .relative() .size_full() @@ -109,14 +107,14 @@ impl ZIndexExample { // HACK: Simulate `text-align: center`. .pl(px(24.)) .z_index(self.z_index) - .child(format!( + .child(SharedString::from(format!( "z-index: {}", if self.z_index == 0 { "auto".to_string() } else { self.z_index.to_string() } - )), + ))), ) // Blue blocks. .child( @@ -173,3 +171,9 @@ impl ZIndexExample { ) } } + +impl ZIndexExample { + pub fn new(z_index: u32) -> Self { + Self { z_index } + } +} diff --git a/crates/storybook2/src/storybook2.rs b/crates/storybook2/src/storybook2.rs index a0bc7cd72f..2a22d91382 100644 --- a/crates/storybook2/src/storybook2.rs +++ b/crates/storybook2/src/storybook2.rs @@ -105,7 +105,7 @@ impl StoryWrapper { } } -impl Render for StoryWrapper { +impl Render for StoryWrapper { type Element = Div; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { diff --git a/crates/terminal_view2/src/terminal_panel.rs b/crates/terminal_view2/src/terminal_panel.rs index 6321e61e35..46885913ed 100644 --- a/crates/terminal_view2/src/terminal_panel.rs +++ b/crates/terminal_view2/src/terminal_panel.rs @@ -335,7 +335,7 @@ impl TerminalPanel { impl EventEmitter for TerminalPanel {} -impl Render for TerminalPanel { +impl Render for TerminalPanel { type Element = Div; fn render(&mut self, _cx: &mut ViewContext) -> Self::Element { diff --git a/crates/terminal_view2/src/terminal_view.rs b/crates/terminal_view2/src/terminal_view.rs index 8f5aeb5630..079f2b9f88 100644 --- a/crates/terminal_view2/src/terminal_view.rs +++ b/crates/terminal_view2/src/terminal_view.rs @@ -9,7 +9,7 @@ pub mod terminal_panel; // use crate::terminal_element::TerminalElement; use editor::{scroll::autoscroll::Autoscroll, Editor}; use gpui::{ - actions, div, img, red, Action, AnyElement, AppContext, Component, DispatchPhase, Div, + actions, div, img, red, Action, AnyElement, AppContext, DispatchPhase, Div, Element, EventEmitter, FocusEvent, FocusHandle, Focusable, FocusableElement, FocusableView, InputHandler, InteractiveElement, KeyDownEvent, Keystroke, Model, MouseButton, ParentElement, Pixels, Render, SharedString, Styled, Task, View, ViewContext, VisualContext, WeakView, @@ -538,7 +538,7 @@ impl TerminalView { } } -impl Render for TerminalView { +impl Render for TerminalView { type Element = Focusable>; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { @@ -578,7 +578,7 @@ impl Render for TerminalView { .children( self.context_menu .clone() - .map(|context_menu| div().z_index(1).absolute().child(context_menu.render())), + .map(|context_menu| div().z_index(1).absolute().child(context_menu)), ) .track_focus(&self.focus_handle) .on_focus_in(Self::focus_in) @@ -756,8 +756,8 @@ impl Item for TerminalView { div() .child(img().uri("icons/terminal.svg").bg(red())) - .child(title) - .render() + .child(SharedString::from(title)) + .into_any() } fn clone_on_split( diff --git a/crates/ui2/src/components/context_menu.rs b/crates/ui2/src/components/context_menu.rs index 41675e6bcd..6235704d7e 100644 --- a/crates/ui2/src/components/context_menu.rs +++ b/crates/ui2/src/components/context_menu.rs @@ -78,7 +78,7 @@ impl Render for ContextMenu { } pub struct MenuHandle { - id: Option, + id: ElementId, child_builder: Option AnyElement + 'static>>, menu_builder: Option) -> View + 'static>>, @@ -87,11 +87,6 @@ pub struct MenuHandle { } impl MenuHandle { - pub fn id(mut self, id: impl Into) -> Self { - self.id = Some(id.into()); - self - } - pub fn menu(mut self, f: impl Fn(&mut V, &mut ViewContext) -> View + 'static) -> Self { self.menu_builder = Some(Rc::new(f)); self @@ -116,9 +111,9 @@ impl MenuHandle { } } -pub fn menu_handle() -> MenuHandle { +pub fn menu_handle(id: impl Into) -> MenuHandle { MenuHandle { - id: None, + id: id.into(), child_builder: None, menu_builder: None, anchor: None, @@ -136,10 +131,6 @@ pub struct MenuHandleState { impl Element for MenuHandle { type State = MenuHandleState; - fn element_id(&self) -> Option { - Some(self.id.clone().expect("menu_handle must have an id()")) - } - fn layout( &mut self, view_state: &mut V, @@ -251,6 +242,10 @@ impl Element for MenuHandle { impl RenderOnce for MenuHandle { type Element = Self; + fn element_id(&self) -> Option { + Some(self.id.clone()) + } + fn render_once(self) -> Self::Element { self } @@ -297,8 +292,7 @@ mod stories { .flex_col() .justify_between() .child( - menu_handle() - .id("test2") + menu_handle("test2") .child(|is_open| { Label::new(if is_open { "TOP LEFT" @@ -309,8 +303,7 @@ mod stories { .menu(move |_, cx| build_menu(cx, "top left")), ) .child( - menu_handle() - .id("test1") + menu_handle("test1") .child(|is_open| { Label::new(if is_open { "BOTTOM LEFT" @@ -329,8 +322,7 @@ mod stories { .flex_col() .justify_between() .child( - menu_handle() - .id("test3") + menu_handle("test3") .child(|is_open| { Label::new(if is_open { "TOP RIGHT" @@ -342,8 +334,7 @@ mod stories { .menu(move |_, cx| build_menu(cx, "top right")), ) .child( - menu_handle() - .id("test4") + menu_handle("test4") .child(|is_open| { Label::new(if is_open { "BOTTOM RIGHT" diff --git a/crates/ui2/src/components/divider.rs b/crates/ui2/src/components/divider.rs index a651ab08af..206f2e26db 100644 --- a/crates/ui2/src/components/divider.rs +++ b/crates/ui2/src/components/divider.rs @@ -1,4 +1,4 @@ -use gpui::RenderOnce; +use gpui::{Div, RenderOnce}; use crate::prelude::*; @@ -7,12 +7,29 @@ enum DividerDirection { Vertical, } -// #[derive(RenderOnce)] +#[derive(RenderOnce)] pub struct Divider { direction: DividerDirection, inset: bool, } +impl Component for Divider { + type Rendered = Div; + + fn render(self, view: &mut V, cx: &mut ViewContext) -> Self::Rendered { + div() + .map(|this| match self.direction { + DividerDirection::Horizontal => { + this.h_px().w_full().when(self.inset, |this| this.mx_1p5()) + } + DividerDirection::Vertical => { + this.w_px().h_full().when(self.inset, |this| this.my_1p5()) + } + }) + .bg(cx.theme().colors().border_variant) + } +} + impl Divider { pub fn horizontal() -> Self { Self { diff --git a/crates/workspace2/src/dock.rs b/crates/workspace2/src/dock.rs index d6b8d9ae79..f143b2c2e5 100644 --- a/crates/workspace2/src/dock.rs +++ b/crates/workspace2/src/dock.rs @@ -1,8 +1,8 @@ use crate::{status_bar::StatusItemView, Axis, Workspace}; use gpui::{ - div, px, Action, AnchorCorner, AnyView, AppContext, Component, Div, Entity, EntityId, - EventEmitter, FocusHandle, FocusableView, ParentElement, Render, RenderOnce, SharedString, - Styled, Subscription, View, ViewContext, VisualContext, WeakView, WindowContext, + div, px, Action, AnchorCorner, AnyView, AppContext, Div, Entity, EntityId, EventEmitter, + FocusHandle, FocusableView, ParentElement, Render, RenderOnce, SharedString, Styled, + Subscription, View, ViewContext, VisualContext, WeakView, WindowContext, }; use schemars::JsonSchema; use serde::{Deserialize, Serialize}; @@ -653,8 +653,7 @@ impl Render for PanelButtons { }; Some( - menu_handle() - .id(name) + menu_handle(name) .menu(move |_, cx| { cx.build_view(|cx| ContextMenu::new(cx).header("SECTION")) }) diff --git a/crates/workspace2/src/pane.rs b/crates/workspace2/src/pane.rs index 4ab78d8bca..50eaa043ed 100644 --- a/crates/workspace2/src/pane.rs +++ b/crates/workspace2/src/pane.rs @@ -7,9 +7,9 @@ use crate::{ use anyhow::Result; use collections::{HashMap, HashSet, VecDeque}; use gpui::{ - actions, prelude::*, Action, AppContext, AsyncWindowContext, Component, Div, EntityId, - EventEmitter, FocusHandle, Focusable, FocusableView, Model, Pixels, Point, PromptLevel, Render, - Task, View, ViewContext, VisualContext, WeakView, WindowContext, + actions, prelude::*, Action, AppContext, AsyncWindowContext, Div, EntityId, EventEmitter, + FocusHandle, Focusable, FocusableView, Model, Pixels, Point, PromptLevel, Render, Task, View, + ViewContext, VisualContext, WeakView, WindowContext, }; use parking_lot::Mutex; use project2::{Project, ProjectEntryId, ProjectPath}; diff --git a/crates/workspace2/src/pane_group.rs b/crates/workspace2/src/pane_group.rs index 68f26295dc..5d02214f9f 100644 --- a/crates/workspace2/src/pane_group.rs +++ b/crates/workspace2/src/pane_group.rs @@ -7,8 +7,7 @@ use db2::sqlez::{ statement::Statement, }; use gpui::{ - point, size, AnyElement, AnyWeakView, Bounds, Div, Model, Pixels, Point, RenderOnce, View, - ViewContext, + point, size, AnyWeakView, Bounds, Div, Model, Pixels, Point, RenderOnce, View, ViewContext, }; use parking_lot::Mutex; use project2::Project; diff --git a/crates/workspace2/src/status_bar.rs b/crates/workspace2/src/status_bar.rs index f961cac8f0..945760260c 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, RenderOnce, Styled, Subscription, View, - ViewContext, WindowContext, + div, AnyView, Div, ParentElement, Render, RenderOnce, Styled, Subscription, View, ViewContext, + WindowContext, }; use theme2::ActiveTheme; use ui::h_stack; From 3abd376d6ad9d175919d47b75767a737aefe67de Mon Sep 17 00:00:00 2001 From: "Joseph T. Lyons" Date: Sun, 19 Nov 2023 21:52:28 -0500 Subject: [PATCH 10/20] Add timestamp delta to telemetry events --- Cargo.lock | 2 + crates/assistant/src/assistant_panel.rs | 14 +- crates/call/src/call.rs | 23 ++-- crates/call2/src/call2.rs | 23 ++-- crates/client/Cargo.toml | 1 + crates/client/src/telemetry.rs | 165 ++++++++++++++++++++--- crates/client2/Cargo.toml | 1 + crates/client2/src/telemetry.rs | 168 +++++++++++++++++++++--- crates/editor/src/editor.rs | 14 +- crates/editor2/src/editor.rs | 16 +-- crates/zed/src/main.rs | 6 +- crates/zed2/src/main.rs | 9 +- 12 files changed, 343 insertions(+), 99 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index fc045354f9..9ecae82810 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1550,6 +1550,7 @@ dependencies = [ "anyhow", "async-recursion 0.3.2", "async-tungstenite", + "chrono", "collections", "db", "feature_flags", @@ -1586,6 +1587,7 @@ dependencies = [ "anyhow", "async-recursion 0.3.2", "async-tungstenite", + "chrono", "collections", "db2", "feature_flags2", diff --git a/crates/assistant/src/assistant_panel.rs b/crates/assistant/src/assistant_panel.rs index 6ab96093a7..cac8bf6c54 100644 --- a/crates/assistant/src/assistant_panel.rs +++ b/crates/assistant/src/assistant_panel.rs @@ -15,7 +15,7 @@ use ai::{ use ai::prompts::repository_context::PromptCodeSnippet; use anyhow::{anyhow, Result}; use chrono::{DateTime, Local}; -use client::{telemetry::AssistantKind, ClickhouseEvent, TelemetrySettings}; +use client::{telemetry::AssistantKind, TelemetrySettings}; use collections::{hash_map, HashMap, HashSet, VecDeque}; use editor::{ display_map::{ @@ -3803,12 +3803,12 @@ fn report_assistant_event( .default_open_ai_model .clone(); - let event = ClickhouseEvent::Assistant { - conversation_id, - kind: assistant_kind, - model: model.full_name(), - }; let telemetry_settings = *settings::get::(cx); - telemetry.report_clickhouse_event(event, telemetry_settings) + telemetry.report_assistant_event( + telemetry_settings, + conversation_id, + assistant_kind, + model.full_name(), + ) } diff --git a/crates/call/src/call.rs b/crates/call/src/call.rs index ca1a60bd63..7959a8c7d1 100644 --- a/crates/call/src/call.rs +++ b/crates/call/src/call.rs @@ -5,10 +5,7 @@ pub mod room; use anyhow::{anyhow, Result}; use audio::Audio; use call_settings::CallSettings; -use client::{ - proto, ClickhouseEvent, Client, TelemetrySettings, TypedEnvelope, User, UserStore, - ZED_ALWAYS_ACTIVE, -}; +use client::{proto, Client, TelemetrySettings, TypedEnvelope, User, UserStore, ZED_ALWAYS_ACTIVE}; use collections::HashSet; use futures::{channel::oneshot, future::Shared, Future, FutureExt}; use gpui::{ @@ -485,12 +482,8 @@ pub fn report_call_event_for_room( ) { let telemetry = client.telemetry(); let telemetry_settings = *settings::get::(cx); - let event = ClickhouseEvent::Call { - operation, - room_id: Some(room_id), - channel_id, - }; - telemetry.report_clickhouse_event(event, telemetry_settings); + + telemetry.report_call_event(telemetry_settings, operation, Some(room_id), channel_id) } pub fn report_call_event_for_channel( @@ -504,12 +497,12 @@ pub fn report_call_event_for_channel( let telemetry = client.telemetry(); let telemetry_settings = *settings::get::(cx); - let event = ClickhouseEvent::Call { + telemetry.report_call_event( + telemetry_settings, operation, - room_id: room.map(|r| r.read(cx).id()), - channel_id: Some(channel_id), - }; - telemetry.report_clickhouse_event(event, telemetry_settings); + room.map(|r| r.read(cx).id()), + Some(channel_id), + ) } #[cfg(test)] diff --git a/crates/call2/src/call2.rs b/crates/call2/src/call2.rs index 2fab3d40ce..1f11e0650d 100644 --- a/crates/call2/src/call2.rs +++ b/crates/call2/src/call2.rs @@ -5,10 +5,7 @@ pub mod room; use anyhow::{anyhow, Result}; use audio::Audio; use call_settings::CallSettings; -use client::{ - proto, ClickhouseEvent, Client, TelemetrySettings, TypedEnvelope, User, UserStore, - ZED_ALWAYS_ACTIVE, -}; +use client::{proto, Client, TelemetrySettings, TypedEnvelope, User, UserStore, ZED_ALWAYS_ACTIVE}; use collections::HashSet; use futures::{channel::oneshot, future::Shared, Future, FutureExt}; use gpui::{ @@ -484,12 +481,8 @@ pub fn report_call_event_for_room( ) { let telemetry = client.telemetry(); let telemetry_settings = *TelemetrySettings::get_global(cx); - let event = ClickhouseEvent::Call { - operation, - room_id: Some(room_id), - channel_id, - }; - telemetry.report_clickhouse_event(event, telemetry_settings); + + telemetry.report_call_event(telemetry_settings, operation, Some(room_id), channel_id) } pub fn report_call_event_for_channel( @@ -504,12 +497,12 @@ pub fn report_call_event_for_channel( let telemetry_settings = *TelemetrySettings::get_global(cx); - let event = ClickhouseEvent::Call { + telemetry.report_call_event( + telemetry_settings, operation, - room_id: room.map(|r| r.read(cx).id()), - channel_id: Some(channel_id), - }; - telemetry.report_clickhouse_event(event, telemetry_settings); + room.map(|r| r.read(cx).id()), + Some(channel_id), + ) } #[cfg(test)] diff --git a/crates/client/Cargo.toml b/crates/client/Cargo.toml index c8085f807b..c24cbca35b 100644 --- a/crates/client/Cargo.toml +++ b/crates/client/Cargo.toml @@ -12,6 +12,7 @@ doctest = false test-support = ["collections/test-support", "gpui/test-support", "rpc/test-support"] [dependencies] +chrono = { version = "0.4", features = ["serde"] } collections = { path = "../collections" } db = { path = "../db" } gpui = { path = "../gpui" } diff --git a/crates/client/src/telemetry.rs b/crates/client/src/telemetry.rs index ad2b29c388..76953679be 100644 --- a/crates/client/src/telemetry.rs +++ b/crates/client/src/telemetry.rs @@ -1,4 +1,5 @@ use crate::{TelemetrySettings, ZED_SECRET_CLIENT_TOKEN, ZED_SERVER_URL}; +use chrono::{DateTime, Utc}; use gpui::{executor::Background, serde_json, AppContext, Task}; use lazy_static::lazy_static; use parking_lot::Mutex; @@ -31,6 +32,7 @@ struct TelemetryState { flush_clickhouse_events_task: Option>, log_file: Option, is_staff: Option, + first_event_datetime: Option>, } const CLICKHOUSE_EVENTS_URL_PATH: &'static str = "/api/events"; @@ -77,42 +79,48 @@ pub enum ClickhouseEvent { vim_mode: bool, copilot_enabled: bool, copilot_enabled_for_language: bool, + milliseconds_since_first_event: i64, }, Copilot { suggestion_id: Option, suggestion_accepted: bool, file_extension: Option, + milliseconds_since_first_event: i64, }, Call { operation: &'static str, room_id: Option, channel_id: Option, + milliseconds_since_first_event: i64, }, Assistant { conversation_id: Option, kind: AssistantKind, model: &'static str, + milliseconds_since_first_event: i64, }, Cpu { usage_as_percentage: f32, core_count: u32, + milliseconds_since_first_event: i64, }, Memory { memory_in_bytes: u64, virtual_memory_in_bytes: u64, + milliseconds_since_first_event: i64, }, } -#[cfg(debug_assertions)] -const MAX_QUEUE_LEN: usize = 1; +// #[cfg(debug_assertions)] +// const MAX_QUEUE_LEN: usize = 1; -#[cfg(not(debug_assertions))] +// #[cfg(not(debug_assertions))] const MAX_QUEUE_LEN: usize = 10; -#[cfg(debug_assertions)] -const DEBOUNCE_INTERVAL: Duration = Duration::from_secs(1); +// #[cfg(debug_assertions)] +// const DEBOUNCE_INTERVAL: Duration = Duration::from_secs(1); -#[cfg(not(debug_assertions))] +// #[cfg(not(debug_assertions))] const DEBOUNCE_INTERVAL: Duration = Duration::from_secs(30); impl Telemetry { @@ -140,6 +148,7 @@ impl Telemetry { flush_clickhouse_events_task: Default::default(), log_file: None, is_staff: None, + first_event_datetime: None, }), }); @@ -195,20 +204,18 @@ impl Telemetry { return; }; - let memory_event = ClickhouseEvent::Memory { - memory_in_bytes: process.memory(), - virtual_memory_in_bytes: process.virtual_memory(), - }; - - let cpu_event = ClickhouseEvent::Cpu { - usage_as_percentage: process.cpu_usage(), - core_count: system.cpus().len() as u32, - }; - let telemetry_settings = cx.update(|cx| *settings::get::(cx)); - this.report_clickhouse_event(memory_event, telemetry_settings); - this.report_clickhouse_event(cpu_event, telemetry_settings); + this.report_memory_event( + telemetry_settings, + process.memory(), + process.virtual_memory(), + ); + this.report_cpu_event( + telemetry_settings, + process.cpu_usage(), + system.cpus().len() as u32, + ); } }) .detach(); @@ -231,7 +238,123 @@ impl Telemetry { drop(state); } - pub fn report_clickhouse_event( + pub fn report_editor_event( + self: &Arc, + telemetry_settings: TelemetrySettings, + file_extension: Option, + vim_mode: bool, + operation: &'static str, + copilot_enabled: bool, + copilot_enabled_for_language: bool, + ) { + let event = ClickhouseEvent::Editor { + file_extension, + vim_mode, + operation, + copilot_enabled, + copilot_enabled_for_language, + milliseconds_since_first_event: self.milliseconds_since_first_event(), + }; + + self.report_clickhouse_event(event, telemetry_settings) + } + + pub fn report_copilot_event( + self: &Arc, + telemetry_settings: TelemetrySettings, + suggestion_id: Option, + suggestion_accepted: bool, + file_extension: Option, + ) { + let event = ClickhouseEvent::Copilot { + suggestion_id, + suggestion_accepted, + file_extension, + milliseconds_since_first_event: self.milliseconds_since_first_event(), + }; + + self.report_clickhouse_event(event, telemetry_settings) + } + + pub fn report_assistant_event( + self: &Arc, + telemetry_settings: TelemetrySettings, + conversation_id: Option, + kind: AssistantKind, + model: &'static str, + ) { + let event = ClickhouseEvent::Assistant { + conversation_id, + kind, + model, + milliseconds_since_first_event: self.milliseconds_since_first_event(), + }; + + self.report_clickhouse_event(event, telemetry_settings) + } + + pub fn report_call_event( + self: &Arc, + telemetry_settings: TelemetrySettings, + operation: &'static str, + room_id: Option, + channel_id: Option, + ) { + let event = ClickhouseEvent::Call { + operation, + room_id, + channel_id, + milliseconds_since_first_event: self.milliseconds_since_first_event(), + }; + + self.report_clickhouse_event(event, telemetry_settings) + } + + pub fn report_cpu_event( + self: &Arc, + telemetry_settings: TelemetrySettings, + usage_as_percentage: f32, + core_count: u32, + ) { + let event = ClickhouseEvent::Cpu { + usage_as_percentage, + core_count, + milliseconds_since_first_event: self.milliseconds_since_first_event(), + }; + + self.report_clickhouse_event(event, telemetry_settings) + } + + pub fn report_memory_event( + self: &Arc, + telemetry_settings: TelemetrySettings, + memory_in_bytes: u64, + virtual_memory_in_bytes: u64, + ) { + let event = ClickhouseEvent::Memory { + memory_in_bytes, + virtual_memory_in_bytes, + milliseconds_since_first_event: self.milliseconds_since_first_event(), + }; + + self.report_clickhouse_event(event, telemetry_settings) + } + + fn milliseconds_since_first_event(&self) -> i64 { + let mut state = self.state.lock(); + match state.first_event_datetime { + Some(first_event_datetime) => { + let now: DateTime = Utc::now(); + now.timestamp_millis() - first_event_datetime.timestamp_millis() + } + None => { + state.first_event_datetime = Some(Utc::now()); + 0 + } + } + } + + fn report_clickhouse_event( self: &Arc, event: ClickhouseEvent, telemetry_settings: TelemetrySettings, @@ -246,6 +369,8 @@ impl Telemetry { .clickhouse_events_queue .push(ClickhouseEventWrapper { signed_in, event }); + dbg!(state.clickhouse_events_queue.len(), chrono::Utc::now()); + if state.installation_id.is_some() { if state.clickhouse_events_queue.len() >= MAX_QUEUE_LEN { drop(state); @@ -275,6 +400,7 @@ impl Telemetry { fn flush_clickhouse_events(self: &Arc) { let mut state = self.state.lock(); + state.first_event_datetime = None; let mut events = mem::take(&mut state.clickhouse_events_queue); state.flush_clickhouse_events_task.take(); drop(state); @@ -310,6 +436,7 @@ impl Telemetry { release_channel: state.release_channel, events, }; + dbg!(&request_body); json_bytes.clear(); serde_json::to_writer(&mut json_bytes, &request_body)?; } diff --git a/crates/client2/Cargo.toml b/crates/client2/Cargo.toml index ace229bc21..b1c993e3a4 100644 --- a/crates/client2/Cargo.toml +++ b/crates/client2/Cargo.toml @@ -12,6 +12,7 @@ doctest = false test-support = ["collections/test-support", "gpui/test-support", "rpc/test-support"] [dependencies] +chrono = { version = "0.4", features = ["serde"] } collections = { path = "../collections" } db = { package = "db2", path = "../db2" } gpui = { package = "gpui2", path = "../gpui2" } diff --git a/crates/client2/src/telemetry.rs b/crates/client2/src/telemetry.rs index cf5b3b765b..d5d6d06213 100644 --- a/crates/client2/src/telemetry.rs +++ b/crates/client2/src/telemetry.rs @@ -1,4 +1,5 @@ use crate::{TelemetrySettings, ZED_SECRET_CLIENT_TOKEN, ZED_SERVER_URL}; +use chrono::{DateTime, Utc}; use gpui::{serde_json, AppContext, AppMetadata, BackgroundExecutor, Task}; use lazy_static::lazy_static; use parking_lot::Mutex; @@ -29,6 +30,7 @@ struct TelemetryState { flush_clickhouse_events_task: Option>, log_file: Option, is_staff: Option, + first_event_datetime: Option>, } const CLICKHOUSE_EVENTS_URL_PATH: &'static str = "/api/events"; @@ -75,42 +77,48 @@ pub enum ClickhouseEvent { vim_mode: bool, copilot_enabled: bool, copilot_enabled_for_language: bool, + milliseconds_since_first_event: i64, }, Copilot { suggestion_id: Option, suggestion_accepted: bool, file_extension: Option, + milliseconds_since_first_event: i64, }, Call { operation: &'static str, room_id: Option, channel_id: Option, + milliseconds_since_first_event: i64, }, Assistant { conversation_id: Option, kind: AssistantKind, model: &'static str, + milliseconds_since_first_event: i64, }, Cpu { usage_as_percentage: f32, core_count: u32, + milliseconds_since_first_event: i64, }, Memory { memory_in_bytes: u64, virtual_memory_in_bytes: u64, + milliseconds_since_first_event: i64, }, } -#[cfg(debug_assertions)] -const MAX_QUEUE_LEN: usize = 1; +// #[cfg(debug_assertions)] +// const MAX_QUEUE_LEN: usize = 1; -#[cfg(not(debug_assertions))] +// #[cfg(not(debug_assertions))] const MAX_QUEUE_LEN: usize = 10; -#[cfg(debug_assertions)] -const DEBOUNCE_INTERVAL: Duration = Duration::from_secs(1); +// #[cfg(debug_assertions)] +// const DEBOUNCE_INTERVAL: Duration = Duration::from_secs(1); -#[cfg(not(debug_assertions))] +// #[cfg(not(debug_assertions))] const DEBOUNCE_INTERVAL: Duration = Duration::from_secs(30); impl Telemetry { @@ -135,6 +143,7 @@ impl Telemetry { flush_clickhouse_events_task: Default::default(), log_file: None, is_staff: None, + first_event_datetime: None, }), }); @@ -190,16 +199,6 @@ impl Telemetry { return; }; - let memory_event = ClickhouseEvent::Memory { - memory_in_bytes: process.memory(), - virtual_memory_in_bytes: process.virtual_memory(), - }; - - let cpu_event = ClickhouseEvent::Cpu { - usage_as_percentage: process.cpu_usage(), - core_count: system.cpus().len() as u32, - }; - let telemetry_settings = if let Ok(telemetry_settings) = cx.update(|cx| *TelemetrySettings::get_global(cx)) { @@ -208,8 +207,16 @@ impl Telemetry { break; }; - this.report_clickhouse_event(memory_event, telemetry_settings); - this.report_clickhouse_event(cpu_event, telemetry_settings); + this.report_memory_event( + telemetry_settings, + process.memory(), + process.virtual_memory(), + ); + this.report_cpu_event( + telemetry_settings, + process.cpu_usage(), + system.cpus().len() as u32, + ); } }) .detach(); @@ -232,7 +239,123 @@ impl Telemetry { drop(state); } - pub fn report_clickhouse_event( + pub fn report_editor_event( + self: &Arc, + telemetry_settings: TelemetrySettings, + file_extension: Option, + vim_mode: bool, + operation: &'static str, + copilot_enabled: bool, + copilot_enabled_for_language: bool, + ) { + let event = ClickhouseEvent::Editor { + file_extension, + vim_mode, + operation, + copilot_enabled, + copilot_enabled_for_language, + milliseconds_since_first_event: self.milliseconds_since_first_event(), + }; + + self.report_clickhouse_event(event, telemetry_settings) + } + + pub fn report_copilot_event( + self: &Arc, + telemetry_settings: TelemetrySettings, + suggestion_id: Option, + suggestion_accepted: bool, + file_extension: Option, + ) { + let event = ClickhouseEvent::Copilot { + suggestion_id, + suggestion_accepted, + file_extension, + milliseconds_since_first_event: self.milliseconds_since_first_event(), + }; + + self.report_clickhouse_event(event, telemetry_settings) + } + + pub fn report_assistant_event( + self: &Arc, + telemetry_settings: TelemetrySettings, + conversation_id: Option, + kind: AssistantKind, + model: &'static str, + ) { + let event = ClickhouseEvent::Assistant { + conversation_id, + kind, + model, + milliseconds_since_first_event: self.milliseconds_since_first_event(), + }; + + self.report_clickhouse_event(event, telemetry_settings) + } + + pub fn report_call_event( + self: &Arc, + telemetry_settings: TelemetrySettings, + operation: &'static str, + room_id: Option, + channel_id: Option, + ) { + let event = ClickhouseEvent::Call { + operation, + room_id, + channel_id, + milliseconds_since_first_event: self.milliseconds_since_first_event(), + }; + + self.report_clickhouse_event(event, telemetry_settings) + } + + pub fn report_cpu_event( + self: &Arc, + telemetry_settings: TelemetrySettings, + usage_as_percentage: f32, + core_count: u32, + ) { + let event = ClickhouseEvent::Cpu { + usage_as_percentage, + core_count, + milliseconds_since_first_event: self.milliseconds_since_first_event(), + }; + + self.report_clickhouse_event(event, telemetry_settings) + } + + pub fn report_memory_event( + self: &Arc, + telemetry_settings: TelemetrySettings, + memory_in_bytes: u64, + virtual_memory_in_bytes: u64, + ) { + let event = ClickhouseEvent::Memory { + memory_in_bytes, + virtual_memory_in_bytes, + milliseconds_since_first_event: self.milliseconds_since_first_event(), + }; + + self.report_clickhouse_event(event, telemetry_settings) + } + + fn milliseconds_since_first_event(&self) -> i64 { + let mut state = self.state.lock(); + match state.first_event_datetime { + Some(first_event_datetime) => { + let now: DateTime = Utc::now(); + now.timestamp_millis() - first_event_datetime.timestamp_millis() + } + None => { + state.first_event_datetime = Some(Utc::now()); + 0 + } + } + } + + fn report_clickhouse_event( self: &Arc, event: ClickhouseEvent, telemetry_settings: TelemetrySettings, @@ -247,6 +370,9 @@ impl Telemetry { .clickhouse_events_queue .push(ClickhouseEventWrapper { signed_in, event }); + dbg!(state.clickhouse_events_queue.len(), chrono::Utc::now()); + dbg!(state.installation_id.is_some()); + if state.installation_id.is_some() { if state.clickhouse_events_queue.len() >= MAX_QUEUE_LEN { drop(state); @@ -276,10 +402,13 @@ impl Telemetry { fn flush_clickhouse_events(self: &Arc) { let mut state = self.state.lock(); + state.first_event_datetime = None; let mut events = mem::take(&mut state.clickhouse_events_queue); state.flush_clickhouse_events_task.take(); drop(state); + dbg!("In flush"); + let this = self.clone(); self.executor .spawn( @@ -317,6 +446,7 @@ impl Telemetry { release_channel: state.release_channel, events, }; + dbg!(&request_body); json_bytes.clear(); serde_json::to_writer(&mut json_bytes, &request_body)?; } diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs index 4e449bb7f7..2558aec121 100644 --- a/crates/editor/src/editor.rs +++ b/crates/editor/src/editor.rs @@ -24,7 +24,7 @@ use ::git::diff::DiffHunk; use aho_corasick::AhoCorasick; use anyhow::{anyhow, Context, Result}; use blink_manager::BlinkManager; -use client::{ClickhouseEvent, Client, Collaborator, ParticipantIndex, TelemetrySettings}; +use client::{Client, Collaborator, ParticipantIndex, TelemetrySettings}; use clock::{Global, ReplicaId}; use collections::{BTreeMap, Bound, HashMap, HashSet, VecDeque}; use convert_case::{Case, Casing}; @@ -8946,12 +8946,12 @@ impl Editor { let telemetry = project.read(cx).client().telemetry().clone(); let telemetry_settings = *settings::get::(cx); - let event = ClickhouseEvent::Copilot { + telemetry.report_copilot_event( + telemetry_settings, suggestion_id, suggestion_accepted, file_extension, - }; - telemetry.report_clickhouse_event(event, telemetry_settings); + ) } #[cfg(any(test, feature = "test-support"))] @@ -8998,14 +8998,14 @@ impl Editor { .show_copilot_suggestions; let telemetry = project.read(cx).client().telemetry().clone(); - let event = ClickhouseEvent::Editor { + telemetry.report_editor_event( + telemetry_settings, file_extension, vim_mode, operation, copilot_enabled, copilot_enabled_for_language, - }; - telemetry.report_clickhouse_event(event, telemetry_settings) + ) } /// Copy the highlighted chunks to the clipboard as JSON. The format is an array of lines, diff --git a/crates/editor2/src/editor.rs b/crates/editor2/src/editor.rs index beed93e917..dc83c02b96 100644 --- a/crates/editor2/src/editor.rs +++ b/crates/editor2/src/editor.rs @@ -24,7 +24,7 @@ use ::git::diff::DiffHunk; use aho_corasick::AhoCorasick; use anyhow::{anyhow, Context as _, Result}; use blink_manager::BlinkManager; -use client::{ClickhouseEvent, Client, Collaborator, ParticipantIndex, TelemetrySettings}; +use client::{Client, Collaborator, ParticipantIndex, TelemetrySettings}; use clock::ReplicaId; use collections::{BTreeMap, Bound, HashMap, HashSet, VecDeque}; use convert_case::{Case, Casing}; @@ -8968,12 +8968,12 @@ impl Editor { let telemetry = project.read(cx).client().telemetry().clone(); let telemetry_settings = *TelemetrySettings::get_global(cx); - let event = ClickhouseEvent::Copilot { + telemetry.report_copilot_event( + telemetry_settings, suggestion_id, suggestion_accepted, file_extension, - }; - telemetry.report_clickhouse_event(event, telemetry_settings); + ) } #[cfg(any(test, feature = "test-support"))] @@ -8985,7 +8985,7 @@ impl Editor { ) { } - #[cfg(not(any(test, feature = "test-support")))] + // #[cfg(not(any(test, feature = "test-support")))] fn report_editor_event( &self, operation: &'static str, @@ -9020,14 +9020,14 @@ impl Editor { .show_copilot_suggestions; let telemetry = project.read(cx).client().telemetry().clone(); - let event = ClickhouseEvent::Editor { + telemetry.report_editor_event( + telemetry_settings, file_extension, vim_mode, operation, copilot_enabled, copilot_enabled_for_language, - }; - telemetry.report_clickhouse_event(event, telemetry_settings) + ) } /// Copy the highlighted chunks to the clipboard as JSON. The format is an array of lines, diff --git a/crates/zed/src/main.rs b/crates/zed/src/main.rs index 0cdedd6745..0e7bd5c3c8 100644 --- a/crates/zed/src/main.rs +++ b/crates/zed/src/main.rs @@ -3,6 +3,7 @@ use anyhow::{anyhow, Context, Result}; use backtrace::Backtrace; +use chrono::{DateTime, Utc}; use cli::FORCE_CLI_MODE_ENV_VAR_NAME; use client::{ self, Client, TelemetrySettings, UserStore, ZED_APP_VERSION, ZED_SECRET_CLIENT_TOKEN, @@ -490,10 +491,7 @@ fn init_panic_hook(app: &App, installation_id: Option, session_id: Strin .ok() .map(|os_version| os_version.to_string()), architecture: env::consts::ARCH.into(), - panicked_on: SystemTime::now() - .duration_since(UNIX_EPOCH) - .unwrap() - .as_millis(), + panicked_on: Utc::now().timestamp_millis(), backtrace, installation_id: installation_id.clone(), session_id: session_id.clone(), diff --git a/crates/zed2/src/main.rs b/crates/zed2/src/main.rs index 6c402514d2..69e0e2b37d 100644 --- a/crates/zed2/src/main.rs +++ b/crates/zed2/src/main.rs @@ -6,6 +6,7 @@ use anyhow::{anyhow, Context as _, Result}; use backtrace::Backtrace; +use chrono::{DateTime, Utc}; use cli::FORCE_CLI_MODE_ENV_VAR_NAME; use client::UserStore; use db::kvp::KEY_VALUE_STORE; @@ -72,6 +73,7 @@ fn main() { let app = App::production(Arc::new(Assets)); let installation_id = app.background_executor().block(installation_id()).ok(); + dbg!("HERE", &installation_id); let session_id = Uuid::new_v4().to_string(); init_panic_hook(&app, installation_id.clone(), session_id.clone()); @@ -172,7 +174,7 @@ fn main() { // }) // .detach(); - // client.telemetry().start(installation_id, session_id, cx); + client.telemetry().start(installation_id, session_id, cx); let app_state = Arc::new(AppState { languages, @@ -514,10 +516,7 @@ fn init_panic_hook(app: &App, installation_id: Option, session_id: Strin .as_ref() .map(SemanticVersion::to_string), architecture: env::consts::ARCH.into(), - panicked_on: SystemTime::now() - .duration_since(UNIX_EPOCH) - .unwrap() - .as_millis(), + panicked_on: Utc::now().timestamp_millis(), backtrace, installation_id: installation_id.clone(), session_id: session_id.clone(), From e0f8615d52bfbddb8463fac79cd7f48f79ac3a3d Mon Sep 17 00:00:00 2001 From: "Joseph T. Lyons" Date: Sun, 19 Nov 2023 21:55:19 -0500 Subject: [PATCH 11/20] Remoe `dbg!()`s --- crates/client/src/telemetry.rs | 3 --- crates/client2/src/telemetry.rs | 6 ------ crates/zed2/src/main.rs | 1 - 3 files changed, 10 deletions(-) diff --git a/crates/client/src/telemetry.rs b/crates/client/src/telemetry.rs index 76953679be..9319d1d841 100644 --- a/crates/client/src/telemetry.rs +++ b/crates/client/src/telemetry.rs @@ -369,8 +369,6 @@ impl Telemetry { .clickhouse_events_queue .push(ClickhouseEventWrapper { signed_in, event }); - dbg!(state.clickhouse_events_queue.len(), chrono::Utc::now()); - if state.installation_id.is_some() { if state.clickhouse_events_queue.len() >= MAX_QUEUE_LEN { drop(state); @@ -436,7 +434,6 @@ impl Telemetry { release_channel: state.release_channel, events, }; - dbg!(&request_body); json_bytes.clear(); serde_json::to_writer(&mut json_bytes, &request_body)?; } diff --git a/crates/client2/src/telemetry.rs b/crates/client2/src/telemetry.rs index d5d6d06213..5020caa6f8 100644 --- a/crates/client2/src/telemetry.rs +++ b/crates/client2/src/telemetry.rs @@ -370,9 +370,6 @@ impl Telemetry { .clickhouse_events_queue .push(ClickhouseEventWrapper { signed_in, event }); - dbg!(state.clickhouse_events_queue.len(), chrono::Utc::now()); - dbg!(state.installation_id.is_some()); - if state.installation_id.is_some() { if state.clickhouse_events_queue.len() >= MAX_QUEUE_LEN { drop(state); @@ -407,8 +404,6 @@ impl Telemetry { state.flush_clickhouse_events_task.take(); drop(state); - dbg!("In flush"); - let this = self.clone(); self.executor .spawn( @@ -446,7 +441,6 @@ impl Telemetry { release_channel: state.release_channel, events, }; - dbg!(&request_body); json_bytes.clear(); serde_json::to_writer(&mut json_bytes, &request_body)?; } diff --git a/crates/zed2/src/main.rs b/crates/zed2/src/main.rs index 69e0e2b37d..9f17332474 100644 --- a/crates/zed2/src/main.rs +++ b/crates/zed2/src/main.rs @@ -73,7 +73,6 @@ fn main() { let app = App::production(Arc::new(Assets)); let installation_id = app.background_executor().block(installation_id()).ok(); - dbg!("HERE", &installation_id); let session_id = Uuid::new_v4().to_string(); init_panic_hook(&app, installation_id.clone(), session_id.clone()); From 8e612e4287b0bbb7fe5a49ad30c8ace57fac4c57 Mon Sep 17 00:00:00 2001 From: "Joseph T. Lyons" Date: Sun, 19 Nov 2023 21:58:42 -0500 Subject: [PATCH 12/20] Restore commented-out code --- crates/client/src/telemetry.rs | 12 ++++++------ crates/client2/src/telemetry.rs | 12 ++++++------ crates/editor2/src/editor.rs | 2 +- crates/zed2/src/main.rs | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/crates/client/src/telemetry.rs b/crates/client/src/telemetry.rs index 9319d1d841..8f7fbeb83d 100644 --- a/crates/client/src/telemetry.rs +++ b/crates/client/src/telemetry.rs @@ -111,16 +111,16 @@ pub enum ClickhouseEvent { }, } -// #[cfg(debug_assertions)] -// const MAX_QUEUE_LEN: usize = 1; +#[cfg(debug_assertions)] +const MAX_QUEUE_LEN: usize = 1; -// #[cfg(not(debug_assertions))] +#[cfg(not(debug_assertions))] const MAX_QUEUE_LEN: usize = 10; -// #[cfg(debug_assertions)] -// const DEBOUNCE_INTERVAL: Duration = Duration::from_secs(1); +#[cfg(debug_assertions)] +const DEBOUNCE_INTERVAL: Duration = Duration::from_secs(1); -// #[cfg(not(debug_assertions))] +#[cfg(not(debug_assertions))] const DEBOUNCE_INTERVAL: Duration = Duration::from_secs(30); impl Telemetry { diff --git a/crates/client2/src/telemetry.rs b/crates/client2/src/telemetry.rs index 5020caa6f8..9c88d1102c 100644 --- a/crates/client2/src/telemetry.rs +++ b/crates/client2/src/telemetry.rs @@ -109,16 +109,16 @@ pub enum ClickhouseEvent { }, } -// #[cfg(debug_assertions)] -// const MAX_QUEUE_LEN: usize = 1; +#[cfg(debug_assertions)] +const MAX_QUEUE_LEN: usize = 1; -// #[cfg(not(debug_assertions))] +#[cfg(not(debug_assertions))] const MAX_QUEUE_LEN: usize = 10; -// #[cfg(debug_assertions)] -// const DEBOUNCE_INTERVAL: Duration = Duration::from_secs(1); +#[cfg(debug_assertions)] +const DEBOUNCE_INTERVAL: Duration = Duration::from_secs(1); -// #[cfg(not(debug_assertions))] +#[cfg(not(debug_assertions))] const DEBOUNCE_INTERVAL: Duration = Duration::from_secs(30); impl Telemetry { diff --git a/crates/editor2/src/editor.rs b/crates/editor2/src/editor.rs index dc83c02b96..be621bc5f6 100644 --- a/crates/editor2/src/editor.rs +++ b/crates/editor2/src/editor.rs @@ -8985,7 +8985,7 @@ impl Editor { ) { } - // #[cfg(not(any(test, feature = "test-support")))] + #[cfg(not(any(test, feature = "test-support")))] fn report_editor_event( &self, operation: &'static str, diff --git a/crates/zed2/src/main.rs b/crates/zed2/src/main.rs index 9f17332474..470ecce8b1 100644 --- a/crates/zed2/src/main.rs +++ b/crates/zed2/src/main.rs @@ -173,7 +173,7 @@ fn main() { // }) // .detach(); - client.telemetry().start(installation_id, session_id, cx); + // client.telemetry().start(installation_id, session_id, cx); let app_state = Arc::new(AppState { languages, From 722ad5a01d4b838e688a214d27113437c487493e Mon Sep 17 00:00:00 2001 From: "Joseph T. Lyons" Date: Sun, 19 Nov 2023 22:03:55 -0500 Subject: [PATCH 13/20] Fix data types --- crates/zed/src/main.rs | 2 +- crates/zed2/src/main.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/zed/src/main.rs b/crates/zed/src/main.rs index 0e7bd5c3c8..a32c95d3e6 100644 --- a/crates/zed/src/main.rs +++ b/crates/zed/src/main.rs @@ -405,7 +405,7 @@ struct Panic { os_name: String, os_version: Option, architecture: String, - panicked_on: u128, + panicked_on: i64, #[serde(skip_serializing_if = "Option::is_none")] installation_id: Option, session_id: String, diff --git a/crates/zed2/src/main.rs b/crates/zed2/src/main.rs index 470ecce8b1..c32b335ca3 100644 --- a/crates/zed2/src/main.rs +++ b/crates/zed2/src/main.rs @@ -429,7 +429,7 @@ struct Panic { os_name: String, os_version: Option, architecture: String, - panicked_on: u128, + panicked_on: i64, #[serde(skip_serializing_if = "Option::is_none")] installation_id: Option, session_id: String, From 5dc3369cf6f350e11c9bee2e48a21d2fba20b0dd Mon Sep 17 00:00:00 2001 From: "Joseph T. Lyons" Date: Sun, 19 Nov 2023 22:04:02 -0500 Subject: [PATCH 14/20] Remove unused imports --- crates/zed/src/main.rs | 3 +-- crates/zed2/src/main.rs | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/crates/zed/src/main.rs b/crates/zed/src/main.rs index a32c95d3e6..5f2a7c525e 100644 --- a/crates/zed/src/main.rs +++ b/crates/zed/src/main.rs @@ -3,7 +3,7 @@ use anyhow::{anyhow, Context, Result}; use backtrace::Backtrace; -use chrono::{DateTime, Utc}; +use chrono::Utc; use cli::FORCE_CLI_MODE_ENV_VAR_NAME; use client::{ self, Client, TelemetrySettings, UserStore, ZED_APP_VERSION, ZED_SECRET_CLIENT_TOKEN, @@ -35,7 +35,6 @@ use std::{ Arc, Weak, }, thread, - time::{SystemTime, UNIX_EPOCH}, }; use util::{ channel::{parse_zed_link, ReleaseChannel}, diff --git a/crates/zed2/src/main.rs b/crates/zed2/src/main.rs index c32b335ca3..5d04e49216 100644 --- a/crates/zed2/src/main.rs +++ b/crates/zed2/src/main.rs @@ -6,7 +6,7 @@ use anyhow::{anyhow, Context as _, Result}; use backtrace::Backtrace; -use chrono::{DateTime, Utc}; +use chrono::Utc; use cli::FORCE_CLI_MODE_ENV_VAR_NAME; use client::UserStore; use db::kvp::KEY_VALUE_STORE; @@ -39,7 +39,6 @@ use std::{ Arc, }, thread, - time::{SystemTime, UNIX_EPOCH}, }; use theme::ActiveTheme; use util::{ From 966bf56ddb681df2f16a1273e4badbc97233787d Mon Sep 17 00:00:00 2001 From: "Joseph T. Lyons" Date: Mon, 20 Nov 2023 09:08:07 -0500 Subject: [PATCH 15/20] Activate telemetry in zed2 --- crates/zed2/src/main.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/zed2/src/main.rs b/crates/zed2/src/main.rs index 5d04e49216..0532d62c38 100644 --- a/crates/zed2/src/main.rs +++ b/crates/zed2/src/main.rs @@ -172,7 +172,7 @@ fn main() { // }) // .detach(); - // client.telemetry().start(installation_id, session_id, cx); + client.telemetry().start(installation_id, session_id, cx); let app_state = Arc::new(AppState { languages, From f86480ba5de91c97b0e87105877ef83078284c58 Mon Sep 17 00:00:00 2001 From: Conrad Irwin Date: Mon, 20 Nov 2023 09:58:05 -0700 Subject: [PATCH 16/20] Merge followup mess --- .../auto_update2/src/update_notification.rs | 4 +- .../command_palette2/src/command_palette.rs | 5 +-- crates/diagnostics2/src/diagnostics.rs | 14 ++++--- crates/diagnostics2/src/items.rs | 6 +-- crates/diagnostics2/src/toolbar_controls.rs | 4 +- crates/editor2/src/editor.rs | 1 - crates/file_finder2/src/file_finder.rs | 7 ++-- crates/go_to_line2/src/go_to_line.rs | 3 +- crates/gpui2/src/elements/text.rs | 29 +++++++++++--- crates/gpui2/src/window.rs | 16 ++++---- crates/project_panel2/src/project_panel.rs | 1 - crates/terminal_view2/src/terminal_view.rs | 2 +- crates/ui2/src/components/button.rs | 2 +- crates/ui2/src/components/context_menu.rs | 26 ++++--------- crates/ui2/src/components/icon_button.rs | 5 ++- crates/ui2/src/components/keybinding.rs | 21 +--------- crates/ui2/src/components/list.rs | 39 ++++++++++--------- crates/workspace2/src/notifications.rs | 2 +- 18 files changed, 90 insertions(+), 97 deletions(-) diff --git a/crates/auto_update2/src/update_notification.rs b/crates/auto_update2/src/update_notification.rs index b77682c9ae..03a71bcabb 100644 --- a/crates/auto_update2/src/update_notification.rs +++ b/crates/auto_update2/src/update_notification.rs @@ -1,4 +1,4 @@ -use gpui::{div, Div, EventEmitter, ParentComponent, Render, SemanticVersion, ViewContext}; +use gpui::{div, Div, EventEmitter, ParentElement, Render, SemanticVersion, ViewContext}; use menu::Cancel; use workspace::notifications::NotificationEvent; @@ -8,7 +8,7 @@ pub struct UpdateNotification { impl EventEmitter for UpdateNotification {} -impl Render for UpdateNotification { +impl Render for UpdateNotification { type Element = Div; fn render(&mut self, _cx: &mut gpui::ViewContext) -> Self::Element { diff --git a/crates/command_palette2/src/command_palette.rs b/crates/command_palette2/src/command_palette.rs index ef8e4cb5fe..1296f35c55 100644 --- a/crates/command_palette2/src/command_palette.rs +++ b/crates/command_palette2/src/command_palette.rs @@ -1,9 +1,8 @@ use collections::{CommandPaletteFilter, HashMap}; use fuzzy::{StringMatch, StringMatchCandidate}; use gpui::{ - actions, actions, div, prelude::*, prelude::*, Action, AppContext, Component, Dismiss, Div, - EventEmitter, FocusHandle, FocusableView, Keystroke, ManagedView, Manager, ParentComponent, - ParentElement, Render, Render, Styled, View, ViewContext, VisualContext, WeakView, + actions, div, prelude::*, Action, AppContext, Div, EventEmitter, FocusHandle, FocusableView, + Keystroke, Manager, ParentElement, Render, Styled, View, ViewContext, VisualContext, WeakView, }; use picker::{Picker, PickerDelegate}; use std::{ diff --git a/crates/diagnostics2/src/diagnostics.rs b/crates/diagnostics2/src/diagnostics.rs index 623b636319..cbaa458c5d 100644 --- a/crates/diagnostics2/src/diagnostics.rs +++ b/crates/diagnostics2/src/diagnostics.rs @@ -14,8 +14,8 @@ use editor::{ use futures::future::try_join_all; use gpui::{ actions, div, AnyElement, AnyView, AppContext, Component, Context, Div, EventEmitter, - FocusEvent, FocusHandle, Focusable, FocusableComponent, FocusableView, InteractiveComponent, - Model, ParentComponent, Render, SharedString, Styled, Subscription, Task, View, ViewContext, + FocusEvent, FocusHandle, Focusable, FocusableElement, FocusableView, InteractiveElement, Model, + ParentElement, Render, RenderOnce, SharedString, Styled, Subscription, Task, View, ViewContext, VisualContext, WeakView, }; use language::{ @@ -90,7 +90,7 @@ struct DiagnosticGroupState { impl EventEmitter for ProjectDiagnosticsEditor {} -impl Render for ProjectDiagnosticsEditor { +impl Render for ProjectDiagnosticsEditor { type Element = Focusable>; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { @@ -792,13 +792,15 @@ fn diagnostic_header_renderer(diagnostic: Diagnostic) -> RenderBlock { .when_some(diagnostic.code.as_ref(), |stack, code| { stack.child(Label::new(code.clone())) }) - .render() + .render_into_any() }) } pub(crate) fn render_summary(summary: &DiagnosticSummary) -> AnyElement { if summary.error_count == 0 && summary.warning_count == 0 { - Label::new("No problems").render() + let label = Label::new("No problems"); + label.render_into_any() + //.render() } else { h_stack() .bg(gpui::red()) @@ -806,7 +808,7 @@ pub(crate) fn render_summary(summary: &DiagnosticSummary) -> AnyElem .child(Label::new(summary.error_count.to_string())) .child(IconElement::new(Icon::ExclamationTriangle)) .child(Label::new(summary.warning_count.to_string())) - .render() + .render_into_any() } } diff --git a/crates/diagnostics2/src/items.rs b/crates/diagnostics2/src/items.rs index dd1b7d98cf..1d5183634f 100644 --- a/crates/diagnostics2/src/items.rs +++ b/crates/diagnostics2/src/items.rs @@ -1,8 +1,8 @@ use collections::HashSet; use editor::{Editor, GoToDiagnostic}; use gpui::{ - rems, Div, EventEmitter, InteractiveComponent, ParentComponent, Render, Stateful, - StatefulInteractiveComponent, Styled, Subscription, View, ViewContext, WeakView, + rems, Div, EventEmitter, InteractiveElement, ParentElement, Render, Stateful, + StatefulInteractiveElement, Styled, Subscription, View, ViewContext, WeakView, }; use language::Diagnostic; use lsp::LanguageServerId; @@ -21,7 +21,7 @@ pub struct DiagnosticIndicator { _observe_active_editor: Option, } -impl Render for DiagnosticIndicator { +impl Render for DiagnosticIndicator { type Element = Stateful>; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { diff --git a/crates/diagnostics2/src/toolbar_controls.rs b/crates/diagnostics2/src/toolbar_controls.rs index 8d4efe00c3..a22217f0a1 100644 --- a/crates/diagnostics2/src/toolbar_controls.rs +++ b/crates/diagnostics2/src/toolbar_controls.rs @@ -1,5 +1,5 @@ use crate::ProjectDiagnosticsEditor; -use gpui::{div, Div, EventEmitter, ParentComponent, Render, ViewContext, WeakView}; +use gpui::{div, Div, EventEmitter, ParentElement, Render, ViewContext, WeakView}; use ui::{Icon, IconButton, Tooltip}; use workspace::{item::ItemHandle, ToolbarItemEvent, ToolbarItemLocation, ToolbarItemView}; @@ -7,7 +7,7 @@ pub struct ToolbarControls { editor: Option>, } -impl Render for ToolbarControls { +impl Render for ToolbarControls { type Element = Div; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { diff --git a/crates/editor2/src/editor.rs b/crates/editor2/src/editor.rs index dad44f212d..5e40f5368e 100644 --- a/crates/editor2/src/editor.rs +++ b/crates/editor2/src/editor.rs @@ -4403,7 +4403,6 @@ impl Editor { } }) .color(ui::TextColor::Muted) - .render() }) }) .flatten() diff --git a/crates/file_finder2/src/file_finder.rs b/crates/file_finder2/src/file_finder.rs index 60ebc9138b..2e7655298a 100644 --- a/crates/file_finder2/src/file_finder.rs +++ b/crates/file_finder2/src/file_finder.rs @@ -2,10 +2,9 @@ use collections::HashMap; use editor::{scroll::autoscroll::Autoscroll, Bias, Editor}; use fuzzy::{CharBag, PathMatch, PathMatchCandidate}; use gpui::{ - actions, div, AppContext, Component, Dismiss, Div, EventEmitter, FocusHandle, FocusableView, - InteractiveComponent, InteractiveElement, ManagedView, Manager, Model, ParentComponent, - ParentElement, Render, RenderOnce, Styled, Styled, Task, View, ViewContext, VisualContext, - WeakView, + actions, div, AppContext, Div, EventEmitter, FocusHandle, FocusableView, InteractiveElement, + Manager, Model, ParentElement, Render, RenderOnce, Styled, Task, View, ViewContext, + VisualContext, WeakView, }; use picker::{Picker, PickerDelegate}; use project::{PathMatchCandidateSet, Project, ProjectPath, WorktreeId}; diff --git a/crates/go_to_line2/src/go_to_line.rs b/crates/go_to_line2/src/go_to_line.rs index 8c260ca717..9b3666ea5c 100644 --- a/crates/go_to_line2/src/go_to_line.rs +++ b/crates/go_to_line2/src/go_to_line.rs @@ -1,8 +1,7 @@ use editor::{display_map::ToDisplayPoint, scroll::autoscroll::Autoscroll, Editor}; use gpui::{ actions, div, prelude::*, AppContext, Div, EventEmitter, FocusHandle, FocusableView, Manager, - ParentComponent, Render, SharedString, Styled, Subscription, View, ViewContext, VisualContext, - WindowContext, + Render, SharedString, Styled, Subscription, View, ViewContext, VisualContext, WindowContext, }; use text::{Bias, Point}; use theme::ActiveTheme; diff --git a/crates/gpui2/src/elements/text.rs b/crates/gpui2/src/elements/text.rs index b5fd6e8774..c68684c8d3 100644 --- a/crates/gpui2/src/elements/text.rs +++ b/crates/gpui2/src/elements/text.rs @@ -256,19 +256,35 @@ impl TextState { let layout_id = cx.request_measured_layout(Default::default(), rem_size, { let element_state = self.clone(); - move |known_dimensions, _| { + + move |known_dimensions, available_space| { + let wrap_width = known_dimensions.width.or(match available_space.width { + crate::AvailableSpace::Definite(x) => Some(x), + _ => None, + }); + + if let Some(text_state) = element_state.0.lock().as_ref() { + if text_state.size.is_some() + && (wrap_width.is_none() || wrap_width == text_state.wrap_width) + { + return text_state.size.unwrap(); + } + } + let Some(lines) = text_system .shape_text( &text, font_size, &runs[..], - known_dimensions.width, // Wrap if we know the width. + wrap_width, // Wrap if we know the width. ) .log_err() else { element_state.lock().replace(TextStateInner { lines: Default::default(), line_height, + wrap_width, + size: Some(Size::default()), }); return Size::default(); }; @@ -280,9 +296,12 @@ impl TextState { size.width = size.width.max(line_size.width); } - element_state - .lock() - .replace(TextStateInner { lines, line_height }); + element_state.lock().replace(TextStateInner { + lines, + line_height, + wrap_width, + size: Some(size), + }); size } diff --git a/crates/gpui2/src/window.rs b/crates/gpui2/src/window.rs index cfd30eb5b6..c17e7e06f4 100644 --- a/crates/gpui2/src/window.rs +++ b/crates/gpui2/src/window.rs @@ -2,14 +2,14 @@ use crate::{ key_dispatch::DispatchActionListener, px, size, Action, AnyDrag, AnyView, AppContext, AsyncWindowContext, AvailableSpace, Bounds, BoxShadow, Context, Corners, CursorStyle, DevicePixels, DispatchNodeId, DispatchTree, DisplayId, Edges, Effect, Entity, EntityId, - EventEmitter, FileDropEvent, FocusEvent, FontId, GlobalElementId, GlyphId, Hsla, ImageData, - InputEvent, IsZero, KeyBinding, KeyContext, KeyDownEvent, LayoutId, Model, ModelContext, - Modifiers, MonochromeSprite, MouseButton, MouseDownEvent, MouseMoveEvent, MouseUpEvent, Path, - Pixels, PlatformAtlas, PlatformDisplay, PlatformInputHandler, PlatformWindow, Point, - PolychromeSprite, PromptLevel, Quad, Render, RenderGlyphParams, RenderImageParams, - RenderSvgParams, ScaledPixels, SceneBuilder, Shadow, SharedString, Size, Style, SubscriberSet, - Subscription, TaffyLayoutEngine, Task, Underline, UnderlineStyle, View, VisualContext, - WeakView, WindowBounds, WindowOptions, SUBPIXEL_VARIANTS, + EventEmitter, FileDropEvent, Flatten, FocusEvent, FontId, GlobalElementId, GlyphId, Hsla, + ImageData, InputEvent, IsZero, KeyBinding, KeyContext, KeyDownEvent, LayoutId, Model, + ModelContext, Modifiers, MonochromeSprite, MouseButton, MouseDownEvent, MouseMoveEvent, + MouseUpEvent, Path, Pixels, PlatformAtlas, PlatformDisplay, PlatformInputHandler, + PlatformWindow, Point, PolychromeSprite, PromptLevel, Quad, Render, RenderGlyphParams, + RenderImageParams, RenderSvgParams, ScaledPixels, SceneBuilder, Shadow, SharedString, Size, + Style, SubscriberSet, Subscription, TaffyLayoutEngine, Task, Underline, UnderlineStyle, View, + VisualContext, WeakView, WindowBounds, WindowOptions, SUBPIXEL_VARIANTS, }; use anyhow::{anyhow, Context as _, Result}; use collections::HashMap; diff --git a/crates/project_panel2/src/project_panel.rs b/crates/project_panel2/src/project_panel.rs index f56ac6d533..da3ada4c10 100644 --- a/crates/project_panel2/src/project_panel.rs +++ b/crates/project_panel2/src/project_panel.rs @@ -247,7 +247,6 @@ impl ProjectPanel { let mut old_dock_position = this.position(cx); ProjectPanelSettings::register(cx); cx.observe_global::(move |this, cx| { - dbg!("OLA!"); let new_dock_position = this.position(cx); if new_dock_position != old_dock_position { old_dock_position = new_dock_position; diff --git a/crates/terminal_view2/src/terminal_view.rs b/crates/terminal_view2/src/terminal_view.rs index 0c099de76d..1bc7ad02a4 100644 --- a/crates/terminal_view2/src/terminal_view.rs +++ b/crates/terminal_view2/src/terminal_view.rs @@ -755,7 +755,7 @@ impl Item for TerminalView { div() .child(IconElement::new(Icon::Terminal)) - .child(title) + .child(Label::new(title)) .into_any() } diff --git a/crates/ui2/src/components/button.rs b/crates/ui2/src/components/button.rs index f22727ae64..efbb4c9e72 100644 --- a/crates/ui2/src/components/button.rs +++ b/crates/ui2/src/components/button.rs @@ -1,7 +1,7 @@ use std::sync::Arc; use gpui::{ - div, DefiniteLength, Div, Hsla, MouseButton, RenderOnce, Stateful, StatefulInteractiveElement, + DefiniteLength, Div, Hsla, MouseButton, RenderOnce, Stateful, StatefulInteractiveElement, WindowContext, }; diff --git a/crates/ui2/src/components/context_menu.rs b/crates/ui2/src/components/context_menu.rs index bbb82e7f1b..81a73e5f77 100644 --- a/crates/ui2/src/components/context_menu.rs +++ b/crates/ui2/src/components/context_menu.rs @@ -1,18 +1,12 @@ use std::cell::RefCell; use std::rc::Rc; -use crate::prelude::*; -use crate::{v_stack, Label, List, ListEntry, ListItem, ListSeparator, ListSubHeader}; +use crate::{prelude::*, v_stack, List, ListItem}; +use crate::{ListEntry, ListSeparator, ListSubHeader}; use gpui::{ -<<<<<<< HEAD - overlay, px, Action, AnchorCorner, AnyElement, Bounds, Dismiss, DispatchPhase, Div, - FocusHandle, LayoutId, ManagedView, MouseButton, MouseDownEvent, Pixels, Point, Render, - RenderOnce, View, -======= overlay, px, Action, AnchorCorner, AnyElement, AppContext, Bounds, DispatchPhase, Div, EventEmitter, FocusHandle, FocusableView, LayoutId, ManagedView, Manager, MouseButton, - MouseDownEvent, Pixels, Point, Render, View, VisualContext, WeakView, ->>>>>>> main + MouseDownEvent, Pixels, Point, Render, RenderOnce, View, VisualContext, WeakView, }; pub enum ContextMenuItem { @@ -30,15 +24,15 @@ pub struct ContextMenu { handle: WeakView, } -impl FocusableView for ContextMenu { +impl FocusableView for ContextMenu { fn focus_handle(&self, _cx: &AppContext) -> FocusHandle { self.focus_handle.clone() } } -impl EventEmitter for ContextMenu {} +impl EventEmitter for ContextMenu {} -impl ContextMenu { +impl ContextMenu { pub fn build( cx: &mut ViewContext, f: impl FnOnce(Self, &mut ViewContext) -> Self, @@ -92,11 +86,7 @@ impl ContextMenu { } } -<<<<<<< HEAD -impl Render for ContextMenu { -======= -impl Render for ContextMenu { ->>>>>>> main +impl Render for ContextMenu { type Element = Div; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { @@ -324,7 +314,7 @@ mod stories { actions!(PrintCurrentDate, PrintBestFood); - fn build_menu( + fn build_menu>( cx: &mut ViewContext, header: impl Into, ) -> View> { diff --git a/crates/ui2/src/components/icon_button.rs b/crates/ui2/src/components/icon_button.rs index ea015e95a6..416c14fe2d 100644 --- a/crates/ui2/src/components/icon_button.rs +++ b/crates/ui2/src/components/icon_button.rs @@ -58,7 +58,10 @@ impl Component for IconButton { .p_1() .bg(bg_color) .cursor_pointer() - .hover(|style| style.bg(bg_hover_color)) + // Nate: Trying to figure out the right places we want to show a + // hover state here. I think it is a bit heavy to have it on every + // place we use an icon button. + // .hover(|style| style.bg(bg_hover_color)) .active(|style| style.bg(bg_active_color)) .child(IconElement::new(self.icon).color(icon_color)); diff --git a/crates/ui2/src/components/keybinding.rs b/crates/ui2/src/components/keybinding.rs index fa5898d0ca..7056dcce56 100644 --- a/crates/ui2/src/components/keybinding.rs +++ b/crates/ui2/src/components/keybinding.rs @@ -1,6 +1,5 @@ use crate::prelude::*; use gpui::{Action, Div, RenderOnce}; -use strum::EnumIter; #[derive(RenderOnce, Clone)] pub struct KeyBinding { @@ -72,22 +71,6 @@ impl Key { } } -// NOTE: The order the modifier keys appear in this enum impacts the order in -// which they are rendered in the UI. -#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy, EnumIter)] -pub enum ModifierKey { - Control, - Alt, - Command, - Shift, -} - -actions!(NoAction); - -pub fn binding(key: &str) -> gpui::KeyBinding { - gpui::KeyBinding::new(key, NoAction {}, None) -} - #[cfg(feature = "stories")] pub use stories::*; @@ -95,7 +78,7 @@ pub use stories::*; mod stories { use super::*; pub use crate::KeyBinding; - use crate::{binding, Story}; + use crate::Story; use gpui::{actions, Div, Render}; use itertools::Itertools; pub struct KeybindingStory; @@ -106,7 +89,7 @@ mod stories { gpui::KeyBinding::new(key, NoAction {}, None) } - impl Render for KeybindingStory { + impl Render for KeybindingStory { type Element = Div; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { diff --git a/crates/ui2/src/components/list.rs b/crates/ui2/src/components/list.rs index 29510f873f..485253d4df 100644 --- a/crates/ui2/src/components/list.rs +++ b/crates/ui2/src/components/list.rs @@ -1,4 +1,4 @@ -use gpui::{div, Action, Div, RenderOnce}; +use gpui::{div, Div, RenderOnce, Stateful, StatefulInteractiveElement}; use std::rc::Rc; use crate::settings::user_settings; @@ -232,7 +232,7 @@ pub enum ListEntrySize { Medium, } -#[derive(RenderOnce, Clone)] +#[derive(Clone)] pub enum ListItem { Entry(ListEntry), Separator(ListSeparator), @@ -257,19 +257,7 @@ impl From for ListItem { } } -impl Component for ListItem { - type Rendered = Div; - - fn render(self, view: &mut V, cx: &mut ViewContext) -> Self::Rendered { - match self { - ListItem::Entry(entry) => div().child(entry.render(ix, cx)), - ListItem::Separator(separator) => div().child(separator.render(view, cx)), - ListItem::Header(header) => div().child(header.render(view, cx)), - } - } -} - -impl ListItem { +impl ListItem { pub fn new(label: Label) -> Self { Self::Entry(ListEntry::new(label)) } @@ -281,6 +269,14 @@ impl ListItem { None } } + + fn render(self, view: &mut V, ix: usize, cx: &mut ViewContext) -> Div { + match self { + ListItem::Entry(entry) => div().child(entry.render(ix, cx)), + ListItem::Separator(separator) => div().child(separator.render(view, cx)), + ListItem::Header(header) => div().child(header.render(view, cx)), + } + } } // #[derive(RenderOnce)] @@ -458,7 +454,7 @@ impl Component for ListSeparator { #[derive(RenderOnce)] pub struct List { - items: Vec, + items: Vec>, /// Message to display when the list is empty /// Defaults to "No items" empty_message: SharedString, @@ -471,7 +467,12 @@ impl Component for List { fn render(self, view: &mut V, cx: &mut ViewContext) -> Self::Rendered { let list_content = match (self.items.is_empty(), self.toggle) { - (false, _) => div().children(self.items), + (false, _) => div().children( + self.items + .into_iter() + .enumerate() + .map(|(ix, item)| item.render(view, ix, cx)), + ), (true, Toggle::Toggled(false)) => div(), (true, _) => { div().child(Label::new(self.empty_message.clone()).color(TextColor::Muted)) @@ -487,7 +488,7 @@ impl Component for List { } impl List { - pub fn new(items: Vec) -> Self { + pub fn new(items: Vec>) -> Self { Self { items, empty_message: "No items".into(), @@ -511,7 +512,7 @@ impl List { self } - fn render(self, _view: &mut V, cx: &mut ViewContext) -> impl Element { + fn render(self, view: &mut V, cx: &mut ViewContext) -> impl Element { let list_content = match (self.items.is_empty(), self.toggle) { (false, _) => div().children( self.items diff --git a/crates/workspace2/src/notifications.rs b/crates/workspace2/src/notifications.rs index df5bbfdd12..e132d821ef 100644 --- a/crates/workspace2/src/notifications.rs +++ b/crates/workspace2/src/notifications.rs @@ -15,7 +15,7 @@ pub enum NotificationEvent { pub trait Notification: EventEmitter + Render {} -impl + Render> Notification for V {} +impl + Render> Notification for V {} pub trait NotificationHandle: Send { fn id(&self) -> EntityId; From f08426c7a036b5ae15e3d3d4c9cfd787ecc3ef42 Mon Sep 17 00:00:00 2001 From: Conrad Irwin Date: Mon, 20 Nov 2023 10:00:37 -0700 Subject: [PATCH 17/20] shhhh --- crates/gpui2_macros/src/derive_render_once.rs | 4 ---- 1 file changed, 4 deletions(-) diff --git a/crates/gpui2_macros/src/derive_render_once.rs b/crates/gpui2_macros/src/derive_render_once.rs index d1dcfc5dc1..732f2df21f 100644 --- a/crates/gpui2_macros/src/derive_render_once.rs +++ b/crates/gpui2_macros/src/derive_render_once.rs @@ -43,10 +43,6 @@ pub fn derive_render_once(input: TokenStream) -> TokenStream { } }; - if type_name == "Avatar" { - println!("{gen}"); - } - gen.into() } From 8599ba557dd886dd9128c827c2b8cddcdae36716 Mon Sep 17 00:00:00 2001 From: Conrad Irwin Date: Mon, 20 Nov 2023 10:01:21 -0700 Subject: [PATCH 18/20] Fix more import errors --- crates/diagnostics2/src/diagnostics.rs | 4 ++-- crates/terminal_view2/src/terminal_view.rs | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/crates/diagnostics2/src/diagnostics.rs b/crates/diagnostics2/src/diagnostics.rs index cbaa458c5d..7203748470 100644 --- a/crates/diagnostics2/src/diagnostics.rs +++ b/crates/diagnostics2/src/diagnostics.rs @@ -13,8 +13,8 @@ use editor::{ }; use futures::future::try_join_all; use gpui::{ - actions, div, AnyElement, AnyView, AppContext, Component, Context, Div, EventEmitter, - FocusEvent, FocusHandle, Focusable, FocusableElement, FocusableView, InteractiveElement, Model, + actions, div, AnyElement, AnyView, AppContext, Context, Div, EventEmitter, FocusEvent, + FocusHandle, Focusable, FocusableElement, FocusableView, InteractiveElement, Model, ParentElement, Render, RenderOnce, SharedString, Styled, Subscription, Task, View, ViewContext, VisualContext, WeakView, }; diff --git a/crates/terminal_view2/src/terminal_view.rs b/crates/terminal_view2/src/terminal_view.rs index 1bc7ad02a4..3cbea11072 100644 --- a/crates/terminal_view2/src/terminal_view.rs +++ b/crates/terminal_view2/src/terminal_view.rs @@ -9,10 +9,10 @@ pub mod terminal_panel; // use crate::terminal_element::TerminalElement; use editor::{scroll::autoscroll::Autoscroll, Editor}; use gpui::{ - actions, div, img, red, Action, AnyElement, AppContext, DispatchPhase, Div, Element, - EventEmitter, FocusEvent, FocusHandle, Focusable, FocusableElement, FocusableView, - InputHandler, InteractiveElement, KeyDownEvent, Keystroke, Model, MouseButton, ParentElement, - Pixels, Render, SharedString, Styled, Task, View, ViewContext, VisualContext, WeakView, + actions, div, Action, AnyElement, AppContext, DispatchPhase, Div, Element, EventEmitter, + FocusEvent, FocusHandle, Focusable, FocusableElement, FocusableView, InputHandler, + InteractiveElement, KeyDownEvent, Keystroke, Model, MouseButton, ParentElement, Pixels, Render, + SharedString, Styled, Task, View, ViewContext, VisualContext, WeakView, }; use language::Bias; use persistence::TERMINAL_DB; From 5d16f7651846e2a40e98cb4945530d9fe02f4357 Mon Sep 17 00:00:00 2001 From: Conrad Irwin Date: Mon, 20 Nov 2023 10:05:57 -0700 Subject: [PATCH 19/20] fmt --- crates/gpui2/src/interactive.rs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/crates/gpui2/src/interactive.rs b/crates/gpui2/src/interactive.rs index 617972e3c0..e988697ca7 100644 --- a/crates/gpui2/src/interactive.rs +++ b/crates/gpui2/src/interactive.rs @@ -1,6 +1,5 @@ use crate::{ - div, point, Div, Element, FocusHandle, Keystroke, Modifiers, Pixels, Point, Render, - ViewContext, + div, point, Div, Element, FocusHandle, Keystroke, Modifiers, Pixels, Point, Render, ViewContext, }; use smallvec::SmallVec; use std::{any::Any, fmt::Debug, marker::PhantomData, ops::Deref, path::PathBuf}; @@ -287,7 +286,7 @@ pub struct FocusEvent { mod test { use crate::{ self as gpui, div, Div, FocusHandle, InteractiveElement, KeyBinding, Keystroke, - ParentElement, Stateful, TestAppContext, Render, VisualContext, + ParentElement, Render, Stateful, TestAppContext, VisualContext, }; struct TestView { From b19a6c0dcc2a775ccf12a5f41cc8e5b58ad79d92 Mon Sep 17 00:00:00 2001 From: Conrad Irwin Date: Mon, 20 Nov 2023 10:16:05 -0700 Subject: [PATCH 20/20] Fix storybook2 --- crates/ui2/src/components/context_menu.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/ui2/src/components/context_menu.rs b/crates/ui2/src/components/context_menu.rs index 81a73e5f77..3814dca471 100644 --- a/crates/ui2/src/components/context_menu.rs +++ b/crates/ui2/src/components/context_menu.rs @@ -309,7 +309,7 @@ pub use stories::*; #[cfg(feature = "stories")] mod stories { use super::*; - use crate::story::Story; + use crate::{story::Story, Label}; use gpui::{actions, Div, Render}; actions!(PrintCurrentDate, PrintBestFood);