dan/gpui-component
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tab: Add to support string children for TabBar. (#677)

Browse source 
## Break changes

- Removed `id` argument from `TabBar::new` method.
This commit is contained in:
Jason Lee 2025-03-03 17:34:17 +08:00 committed by GitHub
parent 1aa43b1bfe
commit bc89ce2536
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 53 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
crates/story/src/tabs_story.rs
View file

@ -99,8 +99,8 @@ impl Render for TabsStory {
})),
)
.child(
section("Normal Tabs", cx).child(
TabBar::new("normal-tabs")
section("Tabs", cx).child(
TabBar::new()
.w_full()
.with_size(self.size)
.selected_index(self.active_tab_ix)
@ -143,8 +143,8 @@ impl Render for TabsStory {
),
)
.child(
section("Pills Tabs", cx).child(
TabBar::new("pills-tabs")
section("Pill Tabs", cx).child(
TabBar::new()
.w_full()
.pill()
.with_size(self.size)
@ -162,7 +162,7 @@ impl Render for TabsStory {
)
.child(
section("Segmented Tabs", cx).child(
TabBar::new("segmented-tabs")
TabBar::new()
.w_full()
.segmented()
.with_size(self.size)
@ -170,17 +170,19 @@ impl Render for TabsStory {
.on_click(cx.listener(|this, ix: &usize, window, cx| {
this.set_active_tab(*ix, window, cx);
}))
.child(Tab::new("tab-account", "Account"))
.child(Tab::new("tab-profile", "Profile").disabled(true))
.child(Tab::new("tab-documents", "Documents"))
.child(Tab::new("tab-mail", "Mail"))
.child(Tab::new("tab-appearance", "Appearance"))
.child(Tab::new("tab-settings", "Settings")),
.children(vec![
"Account",
"Profile",
"Documents",
"Mail",
"Appearance",
"Settings",
]),
),
)
.child(
section("Underline Tabs", cx).child(
TabBar::new("underline-tabs")
TabBar::new()
.w_full()
.underline()
.with_size(self.size)
@ -188,12 +190,12 @@ impl Render for TabsStory {
.on_click(cx.listener(|this, ix: &usize, window, cx| {
this.set_active_tab(*ix, window, cx);
}))
.child(Tab::new("tab-account", "Account"))
.child(Tab::new("tab-profile", "Profile").disabled(true))
.child(Tab::new("tab-documents", "Documents"))
.child(Tab::new("tab-mail", "Mail"))
.child(Tab::new("tab-appearance", "Appearance"))
.child(Tab::new("tab-settings", "Settings")),
.child("Account")
.child("Profile")
.child("Documents")
.child("Mail")
.child("Appearance")
.child("Settings"),
),
)
}

2
crates/ui/src/dock/tab_panel.rs
View file

@ -650,7 +650,7 @@ impl TabPanel {
let tabs_count = self.panels.len();
TabBar::new("tab-bar")
TabBar::new()
.mt(-px(1.))
.track_scroll(self.tab_bar_scroll_handle.clone())
.when(

25
crates/ui/src/tab/tab.rs
View file

@ -4,8 +4,8 @@ use crate::{ActiveTheme, Selectable, Sizable, Size, StyledExt};
use gpui::prelude::FluentBuilder as _;
use gpui::{
div, px, AnyElement, App, ClickEvent, Div, Edges, ElementId, Hsla, InteractiveElement,
IntoElement, ParentElement as _, Pixels, RenderOnce, Stateful, StatefulInteractiveElement,
Styled, Window,
IntoElement, ParentElement as _, Pixels, RenderOnce, SharedString, Stateful,
StatefulInteractiveElement, Styled, Window,
};
#[derive(Debug, Clone, Default, Copy, PartialEq, Eq, Hash)]
@ -333,6 +333,27 @@ pub struct Tab {
on_click: Option<Arc<dyn Fn(&ClickEvent, &mut Window, &mut App) + 'static>>,
}
impl From<&'static str> for Tab {
fn from(label: &'static str) -> Self {
let label = SharedString::from(label);
Self::new(label.clone(), label)
}
}
impl From<String> for Tab {
fn from(label: String) -> Self {
let label = SharedString::from(label);
Self::new(label.clone(), label)
}
}
impl From<SharedString> for Tab {
fn from(label: SharedString) -> Self {
let label = SharedString::from(label);
Self::new(label.clone(), label)
}
}
impl Tab {
pub fn new(id: impl Into<ElementId>, label: impl IntoElement) -> Self {
let id: ElementId = id.into();

19
crates/ui/src/tab/tab_bar.rs
View file

@ -3,8 +3,8 @@ use std::sync::Arc;
use crate::{h_flex, ActiveTheme, Selectable, Sizable, Size, StyledExt};
use gpui::prelude::FluentBuilder as _;
use gpui::{
div, rems, AbsoluteLength, AnyElement, App, Div, Edges, ElementId, IntoElement, ParentElement,
RenderOnce, ScrollHandle, StatefulInteractiveElement as _, Styled, Window,
div, rems, AbsoluteLength, AnyElement, App, Div, Edges, IntoElement, ParentElement, RenderOnce,
ScrollHandle, StatefulInteractiveElement as _, Styled, Window,
};
use gpui::{px, InteractiveElement};
use smallvec::SmallVec;
@ -14,7 +14,6 @@ use super::{Tab, TabVariant};
#[derive(IntoElement)]
pub struct TabBar {
base: Div,
id: ElementId,
scroll_handle: ScrollHandle,
prefix: Option<AnyElement>,
suffix: Option<AnyElement>,
@ -27,10 +26,10 @@ pub struct TabBar {
}
impl TabBar {
pub fn new(id: impl Into<ElementId>) -> Self {
/// Create a new TabBar.
pub fn new() -> Self {
Self {
base: div().px(px(-1.)),
id: id.into(),
children: SmallVec::new(),
scroll_handle: ScrollHandle::new(),
prefix: None,
@ -86,14 +85,15 @@ impl TabBar {
}
/// Add children of the TabBar, all children will inherit the variant.
pub fn children(mut self, children: impl IntoIterator<Item = Tab>) -> Self {
self.children.extend(children);
///
pub fn children(mut self, children: impl IntoIterator<Item = impl Into<Tab>>) -> Self {
self.children.extend(children.into_iter().map(Into::into));
self
}
/// Add child of the TabBar, tab will inherit the variant.
pub fn child(mut self, child: Tab) -> Self {
self.children.push(child);
pub fn child(mut self, child: impl Into<Tab>) -> Self {
self.children.push(child.into());
self
}
@ -157,7 +157,6 @@ impl RenderOnce for TabBar {
};
self.base
.id(self.id)
.group("tab-bar")
.relative()
.flex()