Skip to content

armgit / zed

Public Imported from GitHub
0

Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.

csv_preview: Refine table styling and header button visibility (#60995)

Oleksandr Kholiavko0b94192ebd07
diff --git a/crates/csv_preview/src/renderer/render_table.rs b/crates/csv_preview/src/renderer/render_table.rs
index 3a7e1b3a046..511e36abd17 100644
--- a/crates/csv_preview/src/renderer/render_table.rs
+++ b/crates/csv_preview/src/renderer/render_table.rs
@@ -51,7 +51,6 @@ impl CsvPreviewView {
Table::new(cols)
.interactable(&self.table_interaction_state)
- .striped()
.width_config(ColumnWidthConfig::Resizable(current_widths.clone()))
.header(headers)
.disable_base_style()
diff --git a/crates/csv_preview/src/renderer/row_identifiers.rs b/crates/csv_preview/src/renderer/row_identifiers.rs
index e24441d3885..770e266186f 100644
--- a/crates/csv_preview/src/renderer/row_identifiers.rs
+++ b/crates/csv_preview/src/renderer/row_identifiers.rs
@@ -1,12 +1,12 @@
use ui::{
ActiveTheme as _, AnyElement, Button, ButtonCommon as _, ButtonSize, ButtonStyle,
- Clickable as _, Context, ElementId, IntoElement as _, ParentElement as _, SharedString,
- Styled as _, StyledTypography as _, Tooltip, div,
+ Clickable as _, Context, ElementId, FluentBuilder as _, IntoElement as _, ParentElement as _,
+ SharedString, Styled as _, StyledTypography as _, Tooltip, div,
};
use crate::{
CsvPreviewView,
- settings::RowIdentifiers,
+ settings::{RowIdentifiers, VerticalAlignment},
types::{DataRow, DisplayRow, LineNumber},
};
@@ -169,14 +169,16 @@ impl CsvPreviewView {
let value = div()
.flex()
.px_1()
- .border_b_1()
.border_color(cx.theme().colors().border_variant)
.bg(cx.theme().colors().panel_background)
.h_full()
.text_ui(cx)
- // Row identifiers are always centered
- .items_center()
- .justify_end()
+ .text_color(cx.theme().colors().text_muted)
+ .justify_center()
+ .map(|div| match self.settings.vertical_alignment {
+ VerticalAlignment::Top => div.items_start(),
+ VerticalAlignment::Center => div.items_center(),
+ })
.font_buffer(cx)
.child(row_identifier)
.into_any_element();
diff --git a/crates/csv_preview/src/renderer/table_cell.rs b/crates/csv_preview/src/renderer/table_cell.rs
index 8100731e13a..e792bcac68d 100644
--- a/crates/csv_preview/src/renderer/table_cell.rs
+++ b/crates/csv_preview/src/renderer/table_cell.rs
@@ -27,28 +27,19 @@ fn create_table_cell(
cx: &Context<'_, CsvPreviewView>,
) -> gpui::Stateful<Div> {
div()
- .id(ElementId::Name(
- format!(
- "csv-display-cell-{}-{}",
- *display_cell_id.row, *display_cell_id.col
- )
- .into(),
+ .id(ElementId::NamedInteger(
+ format!("csv-display-cell-{}", *display_cell_id.row).into(),
+ *display_cell_id.col as u64,
))
.cursor_pointer()
.flex()
.h_full()
.px_1()
- .bg(cx.theme().colors().editor_background)
- .border_b_1()
.border_color(cx.theme().colors().border_variant)
.map(|div| match vertical_alignment {
VerticalAlignment::Top => div.items_start(),
VerticalAlignment::Center => div.items_center(),
})
- .map(|div| match vertical_alignment {
- VerticalAlignment::Top => div.content_start(),
- VerticalAlignment::Center => div.content_center(),
- })
.font_buffer(cx)
.tooltip(Tooltip::text(cell_content.clone()))
.child(div().child(cell_content))
diff --git a/crates/csv_preview/src/renderer/table_header.rs b/crates/csv_preview/src/renderer/table_header.rs
index 1ce8d34d22b..6549cb51520 100644
--- a/crates/csv_preview/src/renderer/table_header.rs
+++ b/crates/csv_preview/src/renderer/table_header.rs
@@ -1,5 +1,7 @@
use gpui::ElementId;
-use ui::{ContextMenu, PopoverMenu, Tooltip, prelude::*};
+use ui::{
+ ContextMenu, GradientFade, IconButton, IconName, IconSize, PopoverMenu, Tooltip, prelude::*,
+};
use crate::{
CsvPreviewView,
@@ -19,16 +21,56 @@ impl CsvPreviewView {
cx: &mut Context<'_, CsvPreviewView>,
col_idx: AnyColumn,
) -> AnyElement {
- // CSV data columns: text + filter/sort buttons
+ let has_active_filter = self.engine.has_active_filters(col_idx);
+ let has_active_sort = self
+ .engine
+ .applied_sorting
+ .is_some_and(|o| o.col_idx == col_idx);
+ let always_show_buttons = has_active_filter || has_active_sort;
+ let group_name = SharedString::from(format!("csv-col-header-{}", col_idx.get()));
+
+ let colors = cx.theme().colors();
+ let base_bg = colors.editor_background;
+ let grad_width_hovered = px(100.);
+ let grad_width = if always_show_buttons {
+ grad_width_hovered
+ } else {
+ px(20.)
+ };
h_flex()
- .justify_between()
- .items_center()
+ .group(group_name.clone())
+ .relative()
+ .overflow_hidden()
.w_full()
+ .items_center()
.font_buffer(cx)
- .child(div().child(header_text))
+ .child(
+ div()
+ .flex_1()
+ .min_w_0()
+ .overflow_hidden()
+ .whitespace_nowrap()
+ .child(header_text),
+ )
+ .child(
+ GradientFade::new(base_bg, base_bg, base_bg)
+ .width(grad_width)
+ .width_hovered(grad_width_hovered)
+ .right(px(0.))
+ .gradient_stop(0.8)
+ .group_name(group_name.clone()),
+ )
.child(
h_flex()
+ .absolute()
+ .right_0()
+ .top_0()
+ .h_full()
+ .items_center()
.gap_1()
+ .when(!always_show_buttons, |this| {
+ this.visible_on_hover(group_name)
+ })
.child(self.create_filter_button(cx, col_idx))
.child(self.create_sort_button(cx, col_idx)),
)
@@ -109,16 +151,17 @@ impl CsvPreviewView {
col.get() as u64,
))
.trigger_with_tooltip(
- Button::new(
+ IconButton::new(
ElementId::NamedInteger("filter-button".into(), col.get() as u64),
- if has_active_filters { "⛊" } else { "⛉" },
+ IconName::Filter,
)
- .size(ButtonSize::Compact)
+ .icon_size(IconSize::Small)
.style(if has_active_filters {
ButtonStyle::Filled
} else {
ButtonStyle::Subtle
- }),
+ })
+ .toggle_state(has_active_filters),
Tooltip::text(if has_active_filters {
"Column has active filters. Click to manage"
} else {
diff --git a/crates/ui/src/components/gradient_fade.rs b/crates/ui/src/components/gradient_fade.rs
index 8a982695ece..027167aba9e 100644
--- a/crates/ui/src/components/gradient_fade.rs
+++ b/crates/ui/src/components/gradient_fade.rs
@@ -9,6 +9,7 @@ pub struct GradientFade {
hover_bg: Hsla,
active_bg: Hsla,
width: Pixels,
+ width_hovered: Option<Pixels>,
right: Pixels,
gradient_stop: f32,
group_name: Option<SharedString>,
@@ -24,6 +25,7 @@ impl GradientFade {
right: px(0.0),
gradient_stop: 0.6,
group_name: None,
+ width_hovered: None,
}
}
@@ -32,6 +34,11 @@ impl GradientFade {
self
}
+ pub fn width_hovered(mut self, width: Pixels) -> Self {
+ self.width_hovered = Some(width);
+ self
+ }
+
pub fn right(mut self, right: Pixels) -> Self {
self.right = right;
self
@@ -77,6 +84,7 @@ impl RenderOnce for GradientFade {
linear_color_stop(hover_bg, stop),
linear_color_stop(hover_bg.opacity(0.0), 0.),
))
+ .w(self.width_hovered.unwrap_or(self.width))
})
})
.when_some(self.group_name, |element, group_name| {