
This pull request introduces a new `markdown` crate which is capable of parsing and rendering a Markdown source. One of the key additions is that it enables text selection within a `Markdown` view. Eventually, this will replace `RichText` but for now the goal is to use it in the assistant revamped assistant in the spirit of making progress. <img width="711" alt="image" src="https://github.com/zed-industries/zed/assets/482957/b56c777b-e57c-42f9-95c1-3ada22f63a69"> Note that this pull request doesn't yet use the new markdown renderer in `assistant2`. This is because we need to modify the assistant before slotting in the new renderer and I wanted to merge this independently of those changes. Release Notes: - N/A --------- Co-authored-by: Nathan Sobo <nathan@zed.dev> Co-authored-by: Conrad <conrad@zed.dev> Co-authored-by: Alp <akeles@umd.edu> Co-authored-by: Zachiah Sawyer <zachiah@proton.me>
180 lines
5.9 KiB
Rust
180 lines
5.9 KiB
Rust
use std::cmp::Ordering;
|
|
|
|
use gpui::{AnyElement, IntoElement, Stateful};
|
|
use smallvec::SmallVec;
|
|
|
|
use crate::{prelude::*, BASE_REM_SIZE_IN_PX};
|
|
|
|
/// The position of a [`Tab`] within a list of tabs.
|
|
#[derive(Debug, PartialEq, Eq, Clone, Copy)]
|
|
pub enum TabPosition {
|
|
/// The tab is first in the list.
|
|
First,
|
|
|
|
/// The tab is in the middle of the list (i.e., it is not the first or last tab).
|
|
///
|
|
/// The [`Ordering`] is where this tab is positioned with respect to the selected tab.
|
|
Middle(Ordering),
|
|
|
|
/// The tab is last in the list.
|
|
Last,
|
|
}
|
|
|
|
#[derive(Debug, PartialEq, Eq, Clone, Copy)]
|
|
pub enum TabCloseSide {
|
|
Start,
|
|
End,
|
|
}
|
|
|
|
#[derive(IntoElement)]
|
|
pub struct Tab {
|
|
div: Stateful<Div>,
|
|
selected: bool,
|
|
position: TabPosition,
|
|
close_side: TabCloseSide,
|
|
start_slot: Option<AnyElement>,
|
|
end_slot: Option<AnyElement>,
|
|
children: SmallVec<[AnyElement; 2]>,
|
|
}
|
|
|
|
impl Tab {
|
|
pub fn new(id: impl Into<ElementId>) -> Self {
|
|
let id = id.into();
|
|
Self {
|
|
div: div()
|
|
.id(id.clone())
|
|
.debug_selector(|| format!("TAB-{}", id)),
|
|
selected: false,
|
|
position: TabPosition::First,
|
|
close_side: TabCloseSide::End,
|
|
start_slot: None,
|
|
end_slot: None,
|
|
children: SmallVec::new(),
|
|
}
|
|
}
|
|
|
|
pub const CONTAINER_HEIGHT_IN_REMS: f32 = 29. / BASE_REM_SIZE_IN_PX;
|
|
|
|
const CONTENT_HEIGHT_IN_REMS: f32 = 28. / BASE_REM_SIZE_IN_PX;
|
|
|
|
pub fn position(mut self, position: TabPosition) -> Self {
|
|
self.position = position;
|
|
self
|
|
}
|
|
|
|
pub fn close_side(mut self, close_side: TabCloseSide) -> Self {
|
|
self.close_side = close_side;
|
|
self
|
|
}
|
|
|
|
pub fn start_slot<E: IntoElement>(mut self, element: impl Into<Option<E>>) -> Self {
|
|
self.start_slot = element.into().map(IntoElement::into_any_element);
|
|
self
|
|
}
|
|
|
|
pub fn end_slot<E: IntoElement>(mut self, element: impl Into<Option<E>>) -> Self {
|
|
self.end_slot = element.into().map(IntoElement::into_any_element);
|
|
self
|
|
}
|
|
}
|
|
|
|
impl InteractiveElement for Tab {
|
|
fn interactivity(&mut self) -> &mut gpui::Interactivity {
|
|
self.div.interactivity()
|
|
}
|
|
}
|
|
|
|
impl StatefulInteractiveElement for Tab {}
|
|
|
|
impl Selectable for Tab {
|
|
fn selected(mut self, selected: bool) -> Self {
|
|
self.selected = selected;
|
|
self
|
|
}
|
|
}
|
|
|
|
impl ParentElement for Tab {
|
|
fn extend(&mut self, elements: impl IntoIterator<Item = AnyElement>) {
|
|
self.children.extend(elements)
|
|
}
|
|
}
|
|
|
|
impl RenderOnce for Tab {
|
|
#[allow(refining_impl_trait)]
|
|
fn render(self, cx: &mut WindowContext) -> Stateful<Div> {
|
|
let (text_color, tab_bg, _tab_hover_bg, _tab_active_bg) = match self.selected {
|
|
false => (
|
|
cx.theme().colors().text_muted,
|
|
cx.theme().colors().tab_inactive_background,
|
|
cx.theme().colors().ghost_element_hover,
|
|
cx.theme().colors().ghost_element_active,
|
|
),
|
|
true => (
|
|
cx.theme().colors().text,
|
|
cx.theme().colors().tab_active_background,
|
|
cx.theme().colors().element_hover,
|
|
cx.theme().colors().element_active,
|
|
),
|
|
};
|
|
|
|
self.div
|
|
.h(rems(Self::CONTAINER_HEIGHT_IN_REMS))
|
|
.bg(tab_bg)
|
|
.border_color(cx.theme().colors().border)
|
|
.map(|this| match self.position {
|
|
TabPosition::First => {
|
|
if self.selected {
|
|
this.pl_px().border_r_1().pb_px()
|
|
} else {
|
|
this.pl_px().pr_px().border_b_1()
|
|
}
|
|
}
|
|
TabPosition::Last => {
|
|
if self.selected {
|
|
this.border_l_1().border_r_1().pb_px()
|
|
} else {
|
|
this.pr_px().pl_px().border_b_1().border_r_1()
|
|
}
|
|
}
|
|
TabPosition::Middle(Ordering::Equal) => this.border_l_1().border_r_1().pb_px(),
|
|
TabPosition::Middle(Ordering::Less) => this.border_l_1().pr_px().border_b_1(),
|
|
TabPosition::Middle(Ordering::Greater) => this.border_r_1().pl_px().border_b_1(),
|
|
})
|
|
.cursor_pointer()
|
|
.child(
|
|
h_flex()
|
|
.group("")
|
|
.relative()
|
|
.h(rems(Self::CONTENT_HEIGHT_IN_REMS))
|
|
.px(crate::custom_spacing(cx, 20.))
|
|
.gap(Spacing::Small.rems(cx))
|
|
.text_color(text_color)
|
|
// .hover(|style| style.bg(tab_hover_bg))
|
|
// .active(|style| style.bg(tab_active_bg))
|
|
.child(
|
|
h_flex()
|
|
.size_3()
|
|
.justify_center()
|
|
.absolute()
|
|
.map(|this| match self.close_side {
|
|
TabCloseSide::Start => this.right(Spacing::Small.rems(cx)),
|
|
TabCloseSide::End => this.left(Spacing::Small.rems(cx)),
|
|
})
|
|
.children(self.start_slot),
|
|
)
|
|
.child(
|
|
h_flex()
|
|
.size_3()
|
|
.justify_center()
|
|
.absolute()
|
|
.map(|this| match self.close_side {
|
|
TabCloseSide::Start => this.left(Spacing::Small.rems(cx)),
|
|
TabCloseSide::End => this.right(Spacing::Small.rems(cx)),
|
|
})
|
|
.visible_on_hover("")
|
|
.children(self.end_slot),
|
|
)
|
|
.children(self.children),
|
|
)
|
|
}
|
|
}
|