
There's still a bit more work to do on this, but this PR is compiling (with warnings) after eliminating the key types. When the tasks below are complete, this will be the new narrative for GPUI: - `Entity<T>` - This replaces `View<T>`/`Model<T>`. It represents a unit of state, and if `T` implements `Render`, then `Entity<T>` implements `Element`. - `&mut App` This replaces `AppContext` and represents the app. - `&mut Context<T>` This replaces `ModelContext` and derefs to `App`. It is provided by the framework when updating an entity. - `&mut Window` Broken out of `&mut WindowContext` which no longer exists. Every method that once took `&mut WindowContext` now takes `&mut Window, &mut App` and every method that took `&mut ViewContext<T>` now takes `&mut Window, &mut Context<T>` Not pictured here are the two other failed attempts. It's been quite a month! Tasks: - [x] Remove `View`, `ViewContext`, `WindowContext` and thread through `Window` - [x] [@cole-miller @mikayla-maki] Redraw window when entities change - [x] [@cole-miller @mikayla-maki] Get examples and Zed running - [x] [@cole-miller @mikayla-maki] Fix Zed rendering - [x] [@mikayla-maki] Fix todo! macros and comments - [x] Fix a bug where the editor would not be redrawn because of view caching - [x] remove publicness window.notify() and replace with `AppContext::notify` - [x] remove `observe_new_window_models`, replace with `observe_new_models` with an optional window - [x] Fix a bug where the project panel would not be redrawn because of the wrong refresh() call being used - [x] Fix the tests - [x] Fix warnings by eliminating `Window` params or using `_` - [x] Fix conflicts - [x] Simplify generic code where possible - [x] Rename types - [ ] Update docs ### issues post merge - [x] Issues switching between normal and insert mode - [x] Assistant re-rendering failure - [x] Vim test failures - [x] Mac build issue Release Notes: - N/A --------- Co-authored-by: Antonio Scandurra <me@as-cii.com> Co-authored-by: Cole Miller <cole@zed.dev> Co-authored-by: Mikayla <mikayla@zed.dev> Co-authored-by: Joseph <joseph@zed.dev> Co-authored-by: max <max@zed.dev> Co-authored-by: Michael Sloan <michael@zed.dev> Co-authored-by: Mikayla Maki <mikaylamaki@Mikaylas-MacBook-Pro.local> Co-authored-by: Mikayla <mikayla.c.maki@gmail.com> Co-authored-by: joão <joao@zed.dev>
190 lines
6.4 KiB
Rust
190 lines
6.4 KiB
Rust
//! # UI – Text Field
|
||
//!
|
||
//! This crate provides a text field component that can be used to create text fields like search inputs, form fields, etc.
|
||
//!
|
||
//! It can't be located in the `ui` crate because it depends on `editor`.
|
||
//!
|
||
|
||
use editor::{Editor, EditorElement, EditorStyle};
|
||
use gpui::{App, Entity, FocusHandle, Focusable, FontStyle, Hsla, TextStyle};
|
||
use settings::Settings;
|
||
use theme::ThemeSettings;
|
||
use ui::prelude::*;
|
||
|
||
#[derive(Debug, Clone, Copy, PartialEq)]
|
||
pub enum FieldLabelLayout {
|
||
Hidden,
|
||
Inline,
|
||
Stacked,
|
||
}
|
||
|
||
pub struct TextFieldStyle {
|
||
text_color: Hsla,
|
||
background_color: Hsla,
|
||
border_color: Hsla,
|
||
}
|
||
|
||
/// A Text Field that can be used to create text fields like search inputs, form fields, etc.
|
||
///
|
||
/// It wraps a single line [`Editor`] and allows for common field properties like labels, placeholders, icons, etc.
|
||
pub struct TextField {
|
||
/// An optional label for the text field.
|
||
///
|
||
/// Its position is determined by the [`FieldLabelLayout`].
|
||
label: SharedString,
|
||
/// The placeholder text for the text field.
|
||
placeholder: SharedString,
|
||
/// Exposes the underlying [`Model<Editor>`] to allow for customizing the editor beyond the provided API.
|
||
///
|
||
/// This likely will only be public in the short term, ideally the API will be expanded to cover necessary use cases.
|
||
pub editor: Entity<Editor>,
|
||
/// An optional icon that is displayed at the start of the text field.
|
||
///
|
||
/// For example, a magnifying glass icon in a search field.
|
||
start_icon: Option<IconName>,
|
||
/// The layout of the label relative to the text field.
|
||
with_label: FieldLabelLayout,
|
||
/// Whether the text field is disabled.
|
||
disabled: bool,
|
||
}
|
||
|
||
impl Focusable for TextField {
|
||
fn focus_handle(&self, cx: &App) -> FocusHandle {
|
||
self.editor.focus_handle(cx)
|
||
}
|
||
}
|
||
|
||
impl TextField {
|
||
pub fn new(
|
||
window: &mut Window,
|
||
cx: &mut App,
|
||
label: impl Into<SharedString>,
|
||
placeholder: impl Into<SharedString>,
|
||
) -> Self {
|
||
let placeholder_text = placeholder.into();
|
||
|
||
let editor = cx.new(|cx| {
|
||
let mut input = Editor::single_line(window, cx);
|
||
input.set_placeholder_text(placeholder_text.clone(), cx);
|
||
input
|
||
});
|
||
|
||
Self {
|
||
label: label.into(),
|
||
placeholder: placeholder_text,
|
||
editor,
|
||
start_icon: None,
|
||
with_label: FieldLabelLayout::Hidden,
|
||
disabled: false,
|
||
}
|
||
}
|
||
|
||
pub fn start_icon(mut self, icon: IconName) -> Self {
|
||
self.start_icon = Some(icon);
|
||
self
|
||
}
|
||
|
||
pub fn with_label(mut self, layout: FieldLabelLayout) -> Self {
|
||
self.with_label = layout;
|
||
self
|
||
}
|
||
|
||
pub fn set_disabled(&mut self, disabled: bool, cx: &mut Context<Self>) {
|
||
self.disabled = disabled;
|
||
self.editor
|
||
.update(cx, |editor, _| editor.set_read_only(disabled))
|
||
}
|
||
|
||
pub fn editor(&self) -> &Entity<Editor> {
|
||
&self.editor
|
||
}
|
||
}
|
||
|
||
impl Render for TextField {
|
||
fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
|
||
let settings = ThemeSettings::get_global(cx);
|
||
let theme_color = cx.theme().colors();
|
||
|
||
let mut style = TextFieldStyle {
|
||
text_color: theme_color.text,
|
||
background_color: theme_color.ghost_element_background,
|
||
border_color: theme_color.border,
|
||
};
|
||
|
||
if self.disabled {
|
||
style.text_color = theme_color.text_disabled;
|
||
style.background_color = theme_color.ghost_element_disabled;
|
||
style.border_color = theme_color.border_disabled;
|
||
}
|
||
|
||
// if self.error_message.is_some() {
|
||
// style.text_color = cx.theme().status().error;
|
||
// style.border_color = cx.theme().status().error_border
|
||
// }
|
||
|
||
let text_style = TextStyle {
|
||
font_family: settings.buffer_font.family.clone(),
|
||
font_features: settings.buffer_font.features.clone(),
|
||
font_size: rems(0.875).into(),
|
||
font_weight: settings.buffer_font.weight,
|
||
font_style: FontStyle::Normal,
|
||
line_height: relative(1.2),
|
||
color: style.text_color,
|
||
..Default::default()
|
||
};
|
||
|
||
let editor_style = EditorStyle {
|
||
background: theme_color.ghost_element_background,
|
||
local_player: cx.theme().players().local(),
|
||
text: text_style,
|
||
..Default::default()
|
||
};
|
||
|
||
div()
|
||
.id(self.placeholder.clone())
|
||
.group("text-field")
|
||
.w_full()
|
||
.when(self.with_label == FieldLabelLayout::Stacked, |this| {
|
||
this.child(
|
||
Label::new(self.label.clone())
|
||
.size(LabelSize::Default)
|
||
.color(if self.disabled {
|
||
Color::Disabled
|
||
} else {
|
||
Color::Muted
|
||
}),
|
||
)
|
||
})
|
||
.child(
|
||
v_flex().w_full().child(
|
||
h_flex()
|
||
.w_full()
|
||
.flex_grow()
|
||
.gap_2()
|
||
.when(self.with_label == FieldLabelLayout::Inline, |this| {
|
||
this.child(Label::new(self.label.clone()).size(LabelSize::Default))
|
||
})
|
||
.child(
|
||
h_flex()
|
||
.px_2()
|
||
.py_1()
|
||
.bg(style.background_color)
|
||
.text_color(style.text_color)
|
||
.rounded_lg()
|
||
.border_1()
|
||
.border_color(style.border_color)
|
||
.min_w_48()
|
||
.w_full()
|
||
.flex_grow()
|
||
.gap_1()
|
||
.when_some(self.start_icon, |this, icon| {
|
||
this.child(
|
||
Icon::new(icon).size(IconSize::Small).color(Color::Muted),
|
||
)
|
||
})
|
||
.child(EditorElement::new(&self.editor, editor_style)),
|
||
),
|
||
),
|
||
)
|
||
}
|
||
}
|