Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ui2: Get component stories compiling again (#3376)

Browse source 
This PR gets the component stories defined in `ui2` compiling again.

Release Notes:

- N/A
This commit is contained in:
Marshall Bowers 2023-11-21 12:06:25 -05:00 • committed by GitHub
parent 6cd0bcc578
commit f4b4bdfd83
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 399 additions and 455 deletions
Download patch file Download diff file Expand all files Collapse all files

8
crates/ui2/src/components.rs
View file

@ -12,10 +12,12 @@ mod label;
mod list;
mod slot;
mod stack;
mod stories;
mod toggle;
mod tooltip;
#[cfg(feature = "stories")]
mod stories;
pub use avatar::*;
pub use button::*;
pub use checkbox::*;
@ -30,6 +32,8 @@ pub use label::*;
pub use list::*;
pub use slot::*;
pub use stack::*;
pub use stories::*;
pub use toggle::*;
pub use tooltip::*;
#[cfg(feature = "stories")]
pub use stories::*;

8
crates/ui2/src/components/stories.rs Normal file
View file

@ -0,0 +1,8 @@
mod avatar;
mod button;
mod checkbox;
mod context_menu;
mod icon;
mod input;
mod keybinding;
mod label;

15
crates/ui2/src/components/stories/avatar.rs
View file

@ -1,15 +1,11 @@
#[cfg(feature = "stories")]
pub use stories::*;
use gpui::{Div, Render};
#[cfg(feature = "stories")]
mod stories {
use super::*;
use crate::Story;
use gpui::{Div, Render};
use crate::prelude::*;
use crate::{Avatar, Story};
pub struct AvatarStory;
pub struct AvatarStory;
impl Render for AvatarStory {
impl Render for AvatarStory {
type Element = Div;
fn render(&mut self, cx: &mut ViewContext<Self>) -> Self::Element {
@ -23,5 +19,4 @@ mod stories {
"https://avatars.githubusercontent.com/u/326587?v=4",
))
}
}
}

53
crates/ui2/src/components/stories/button.rs
View file

@ -1,16 +1,12 @@
#[cfg(feature = "stories")]
pub use stories::*;
use gpui::{rems, Div, Render};
use strum::IntoEnumIterator;
#[cfg(feature = "stories")]
mod stories {
use super::*;
use crate::{h_stack, v_stack, Color, Story};
use gpui::{rems, Div, Render};
use strum::IntoEnumIterator;
use crate::prelude::*;
use crate::{h_stack, v_stack, Button, Icon, IconPosition, Label, Story};
pub struct ButtonStory;
pub struct ButtonStory;
impl Render for ButtonStory {
impl Render for ButtonStory {
type Element = Div;
fn render(&mut self, cx: &mut ViewContext<Self>) -> Self::Element {
@ -28,9 +24,7 @@ mod stories {
.child(h_stack().gap_2().children(states.clone().map(|state| {
v_stack()
.gap_1()
.child(
Label::new(state.to_string()).color(TextColor::Muted),
)
.child(Label::new(state.to_string()).color(Color::Muted))
.child(
Button::new("Label").variant(ButtonVariant::Ghost), // .state(state),
)
@ -39,9 +33,7 @@ mod stories {
.child(h_stack().gap_2().children(states.clone().map(|state| {
v_stack()
.gap_1()
.child(
Label::new(state.to_string()).color(TextColor::Muted),
)
.child(Label::new(state.to_string()).color(Color::Muted))
.child(
Button::new("Label")
.variant(ButtonVariant::Ghost)
@ -53,9 +45,7 @@ mod stories {
.child(h_stack().gap_2().children(states.clone().map(|state| {
v_stack()
.gap_1()
.child(
Label::new(state.to_string()).color(TextColor::Muted),
)
.child(Label::new(state.to_string()).color(Color::Muted))
.child(
Button::new("Label")
.variant(ButtonVariant::Ghost)
@ -70,9 +60,7 @@ mod stories {
.child(h_stack().gap_2().children(states.clone().map(|state| {
v_stack()
.gap_1()
.child(
Label::new(state.to_string()).color(TextColor::Muted),
)
.child(Label::new(state.to_string()).color(Color::Muted))
.child(
Button::new("Label").variant(ButtonVariant::Filled), // .state(state),
)
@ -81,9 +69,7 @@ mod stories {
.child(h_stack().gap_2().children(states.clone().map(|state| {
v_stack()
.gap_1()
.child(
Label::new(state.to_string()).color(TextColor::Muted),
)
.child(Label::new(state.to_string()).color(Color::Muted))
.child(
Button::new("Label")
.variant(ButtonVariant::Filled)
@ -95,9 +81,7 @@ mod stories {
.child(h_stack().gap_2().children(states.clone().map(|state| {
v_stack()
.gap_1()
.child(
Label::new(state.to_string()).color(TextColor::Muted),
)
.child(Label::new(state.to_string()).color(Color::Muted))
.child(
Button::new("Label")
.variant(ButtonVariant::Filled)
@ -112,9 +96,7 @@ mod stories {
.child(h_stack().gap_2().children(states.clone().map(|state| {
v_stack()
.gap_1()
.child(
Label::new(state.to_string()).color(TextColor::Muted),
)
.child(Label::new(state.to_string()).color(Color::Muted))
.child(
Button::new("Label")
.variant(ButtonVariant::Filled)
@ -126,9 +108,7 @@ mod stories {
.child(h_stack().gap_2().children(states.clone().map(|state| {
v_stack()
.gap_1()
.child(
Label::new(state.to_string()).color(TextColor::Muted),
)
.child(Label::new(state.to_string()).color(Color::Muted))
.child(
Button::new("Label")
.variant(ButtonVariant::Filled)
@ -142,9 +122,7 @@ mod stories {
.child(h_stack().gap_2().children(states.clone().map(|state| {
v_stack()
.gap_1()
.child(
Label::new(state.to_string()).color(TextColor::Muted),
)
.child(Label::new(state.to_string()).color(Color::Muted))
.child(
Button::new("Label")
.variant(ButtonVariant::Filled)
@ -163,5 +141,4 @@ mod stories {
.on_click(|_, cx| println!("Button clicked.")),
)
}
}
}

25
crates/ui2/src/components/stories/checkbox.rs
View file

@ -1,15 +1,11 @@
#[cfg(feature = "stories")]
pub use stories::*;
use gpui::{Div, Render, ViewContext};
#[cfg(feature = "stories")]
mod stories {
use super::*;
use crate::{h_stack, Story};
use gpui::{Div, Render, ViewContext};
use crate::prelude::*;
use crate::{h_stack, Checkbox, Story};
pub struct CheckboxStory;
pub struct CheckboxStory;
impl Render for CheckboxStory {
impl Render for CheckboxStory {
type Element = Div;
fn render(&mut self, cx: &mut ViewContext<Self>) -> Self::Element {
@ -38,15 +34,9 @@ mod stories {
.rounded_md()
.border()
.border_color(cx.theme().colors().border)
.child(Checkbox::new("checkbox-disabled", Selection::Unselected).disabled(true))
.child(
Checkbox::new("checkbox-disabled", Selection::Unselected)
.disabled(true),
)
.child(
Checkbox::new(
"checkbox-disabled-intermediate",
Selection::Indeterminate,
)
Checkbox::new("checkbox-disabled-intermediate", Selection::Indeterminate)
.disabled(true),
)
.child(
@ -55,5 +45,4 @@ mod stories {
),
)
}
}
}

21
crates/ui2/src/components/stories/context_menu.rs
View file

@ -1,15 +1,11 @@
#[cfg(feature = "stories")]
pub use stories::*;
use gpui::{actions, Action, AnchorCorner, Div, Render, View};
#[cfg(feature = "stories")]
mod stories {
use super::*;
use crate::{story::Story, Label};
use gpui::{actions, Div, Render};
use crate::prelude::*;
use crate::{menu_handle, ContextMenu, Label, ListItem, Story};
actions!(PrintCurrentDate, PrintBestFood);
actions!(PrintCurrentDate, PrintBestFood);
fn build_menu(cx: &mut WindowContext, header: impl Into<SharedString>) -> View<ContextMenu> {
fn build_menu(cx: &mut WindowContext, header: impl Into<SharedString>) -> View<ContextMenu> {
ContextMenu::build(cx, |menu, _| {
menu.header(header)
.separator()
@ -25,11 +21,11 @@ mod stories {
|v, cx| cx.dispatch_action(PrintBestFood.boxed_clone()),
)
})
}
}
pub struct ContextMenuStory;
pub struct ContextMenuStory;
impl Render for ContextMenuStory {
impl Render for ContextMenuStory {
type Element = Div;
fn render(&mut self, cx: &mut ViewContext<Self>) -> Self::Element {
@ -108,5 +104,4 @@ mod stories {
),
)
}
}
}

19
crates/ui2/src/components/stories/icon.rs
View file

@ -1,18 +1,12 @@
#[cfg(feature = "stories")]
pub use stories::*;
use gpui::{Div, Render};
use strum::IntoEnumIterator;
#[cfg(feature = "stories")]
mod stories {
use gpui::{Div, Render};
use strum::IntoEnumIterator;
use crate::prelude::*;
use crate::{Icon, IconElement, Story};
use crate::Story;
pub struct IconStory;
use super::*;
pub struct IconStory;
impl Render for IconStory {
impl Render for IconStory {
type Element = Div;
fn render(&mut self, cx: &mut ViewContext<Self>) -> Self::Element {
@ -23,5 +17,4 @@ mod stories {
.child(Story::label(cx, "All Icons"))
.child(div().flex().gap_3().children(icons.map(IconElement::new)))
}
}
}

15
crates/ui2/src/components/stories/input.rs
View file

@ -1,15 +1,11 @@
#[cfg(feature = "stories")]
pub use stories::*;
use gpui::{Div, Render};
#[cfg(feature = "stories")]
mod stories {
use super::*;
use crate::Story;
use gpui::{Div, Render};
use crate::prelude::*;
use crate::{Input, Story};
pub struct InputStory;
pub struct InputStory;
impl Render for InputStory {
impl Render for InputStory {
type Element = Div;
fn render(&mut self, cx: &mut ViewContext<Self>) -> Self::Element {
@ -18,5 +14,4 @@ mod stories {
.child(Story::label(cx, "Default"))
.child(div().flex().child(Input::new("Search")))
}
}
}

28
crates/ui2/src/components/stories/keybinding.rs
View file

@ -1,27 +1,22 @@
#[cfg(feature = "stories")]
pub use stories::*;
use gpui::{actions, Div, Render};
use itertools::Itertools;
#[cfg(feature = "stories")]
mod stories {
use super::*;
pub use crate::KeyBinding;
use crate::Story;
use gpui::{actions, Div, Render};
use itertools::Itertools;
pub struct KeybindingStory;
use crate::prelude::*;
use crate::{KeyBinding, Story};
actions!(NoAction);
pub struct KeybindingStory;
pub fn binding(key: &str) -> gpui::KeyBinding {
actions!(NoAction);
pub fn binding(key: &str) -> gpui::KeyBinding {
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>) -> Self::Element {
let all_modifier_permutations =
["ctrl", "alt", "cmd", "shift"].into_iter().permutations(2);
let all_modifier_permutations = ["ctrl", "alt", "cmd", "shift"].into_iter().permutations(2);
Story::container(cx)
.child(Story::title_for::<KeyBinding>(cx))
@ -62,5 +57,4 @@ mod stories {
.child(KeyBinding::new(binding("ctrl-a shift-z")))
.child(KeyBinding::new(binding("fn-s")))
}
}
}

15
crates/ui2/src/components/stories/label.rs
View file

@ -1,15 +1,11 @@
#[cfg(feature = "stories")]
pub use stories::*;
use gpui::{Div, Render};
#[cfg(feature = "stories")]
mod stories {
use super::*;
use crate::Story;
use gpui::{Div, Render};
use crate::prelude::*;
use crate::{HighlightedLabel, Label, Story};
pub struct LabelStory;
pub struct LabelStory;
impl Render for LabelStory {
impl Render for LabelStory {
type Element = Div;
fn render(&mut self, cx: &mut ViewContext<Self>) -> Self::Element {
@ -27,5 +23,4 @@ mod stories {
vec![0, 1, 3, 8, 9, 13],
))
}
}
}

1
crates/ui2/src/components/stories/mod.rs
View file

@ -1 +0,0 @@