ui2: Get component stories compiling again (#3376)

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

Release Notes:

- N/A

crates/ui2/src/components.rs

@@ -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::*;

crates/ui2/src/components/stories.rs

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

crates/ui2/src/components/stories/avatar.rs

@@ -1,12 +1,8 @@
-#[cfg(feature = "stories")]
-pub use stories::*;
-
-#[cfg(feature = "stories")]
-mod stories {
-    use super::*;
-    use crate::Story;
 use gpui::{Div, Render};
 
+use crate::prelude::*;
+use crate::{Avatar, Story};
+
 pub struct AvatarStory;
 
 impl Render for AvatarStory {
@@ -24,4 +20,3 @@ mod stories {
             ))
     }
 }
-}

crates/ui2/src/components/stories/button.rs

@@ -1,13 +1,9 @@
-#[cfg(feature = "stories")]
-pub use stories::*;
-
-#[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;
 
 impl Render for ButtonStory {
@@ -28,9 +24,7 @@ mod stories {
                             .child(h_stack().gap_2().children(states.clone().map(|state| {
                                 v_stack()
                                     .gap_1()
-                                        .child(
+                                    .child(Label::new(state.to_string()).color(Color::Muted))
-                                            Label::new(state.to_string()).color(TextColor::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(
+                                    .child(Label::new(state.to_string()).color(Color::Muted))
-                                            Label::new(state.to_string()).color(TextColor::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(
+                                    .child(Label::new(state.to_string()).color(Color::Muted))
-                                            Label::new(state.to_string()).color(TextColor::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(
+                                    .child(Label::new(state.to_string()).color(Color::Muted))
-                                            Label::new(state.to_string()).color(TextColor::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(
+                                    .child(Label::new(state.to_string()).color(Color::Muted))
-                                            Label::new(state.to_string()).color(TextColor::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(
+                                    .child(Label::new(state.to_string()).color(Color::Muted))
-                                            Label::new(state.to_string()).color(TextColor::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(
+                                    .child(Label::new(state.to_string()).color(Color::Muted))
-                                            Label::new(state.to_string()).color(TextColor::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(
+                                    .child(Label::new(state.to_string()).color(Color::Muted))
-                                            Label::new(state.to_string()).color(TextColor::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(
+                                    .child(Label::new(state.to_string()).color(Color::Muted))
-                                            Label::new(state.to_string()).color(TextColor::Muted),
-                                        )
                                     .child(
                                         Button::new("Label")
                                             .variant(ButtonVariant::Filled)
@@ -164,4 +142,3 @@ mod stories {
             )
     }
 }
-}

crates/ui2/src/components/stories/checkbox.rs

@@ -1,12 +1,8 @@
-#[cfg(feature = "stories")]
-pub use stories::*;
-
-#[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;
 
 impl Render for CheckboxStory {
@@ -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)
+                        Checkbox::new("checkbox-disabled-intermediate", Selection::Indeterminate)
-                                .disabled(true),
-                        )
-                        .child(
-                            Checkbox::new(
-                                "checkbox-disabled-intermediate",
-                                Selection::Indeterminate,
-                            )
                             .disabled(true),
                     )
                     .child(
@@ -56,4 +46,3 @@ mod stories {
             )
     }
 }
-}

crates/ui2/src/components/stories/context_menu.rs

@@ -1,11 +1,7 @@
-#[cfg(feature = "stories")]
+use gpui::{actions, Action, AnchorCorner, Div, Render, View};
-pub use stories::*;
 
-#[cfg(feature = "stories")]
+use crate::prelude::*;
-mod stories {
+use crate::{menu_handle, ContextMenu, Label, ListItem, Story};
-    use super::*;
-    use crate::{story::Story, Label};
-    use gpui::{actions, Div, Render};
 
 actions!(PrintCurrentDate, PrintBestFood);
 
@@ -109,4 +105,3 @@ mod stories {
             )
     }
 }
-}

crates/ui2/src/components/stories/icon.rs

@@ -1,14 +1,8 @@
-#[cfg(feature = "stories")]
-pub use stories::*;
-
-#[cfg(feature = "stories")]
-mod stories {
 use gpui::{Div, Render};
 use strum::IntoEnumIterator;
 
-    use crate::Story;
+use crate::prelude::*;
-
+use crate::{Icon, IconElement, Story};
-    use super::*;
 
 pub struct IconStory;
 
@@ -24,4 +18,3 @@ mod stories {
             .child(div().flex().gap_3().children(icons.map(IconElement::new)))
     }
 }
-}

crates/ui2/src/components/stories/input.rs

@@ -1,12 +1,8 @@
-#[cfg(feature = "stories")]
-pub use stories::*;
-
-#[cfg(feature = "stories")]
-mod stories {
-    use super::*;
-    use crate::Story;
 use gpui::{Div, Render};
 
+use crate::prelude::*;
+use crate::{Input, Story};
+
 pub struct InputStory;
 
 impl Render for InputStory {
@@ -19,4 +15,3 @@ mod stories {
             .child(div().flex().child(Input::new("Search")))
     }
 }
-}

crates/ui2/src/components/stories/keybinding.rs

@@ -1,13 +1,9 @@
-#[cfg(feature = "stories")]
-pub use stories::*;
-
-#[cfg(feature = "stories")]
-mod stories {
-    use super::*;
-    pub use crate::KeyBinding;
-    use crate::Story;
 use gpui::{actions, Div, Render};
 use itertools::Itertools;
+
+use crate::prelude::*;
+use crate::{KeyBinding, Story};
+
 pub struct KeybindingStory;
 
 actions!(NoAction);
@@ -20,8 +16,7 @@ mod stories {
     type Element = Div;
 
     fn render(&mut self, cx: &mut ViewContext<Self>) -> Self::Element {
-            let all_modifier_permutations =
+        let all_modifier_permutations = ["ctrl", "alt", "cmd", "shift"].into_iter().permutations(2);
-                ["ctrl", "alt", "cmd", "shift"].into_iter().permutations(2);
 
         Story::container(cx)
             .child(Story::title_for::<KeyBinding>(cx))
@@ -63,4 +58,3 @@ mod stories {
             .child(KeyBinding::new(binding("fn-s")))
     }
 }
-}

crates/ui2/src/components/stories/label.rs

@@ -1,12 +1,8 @@
-#[cfg(feature = "stories")]
-pub use stories::*;
-
-#[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;
 
 impl Render for LabelStory {
@@ -28,4 +24,3 @@ mod stories {
             ))
     }
 }
-}

crates/ui2/src/components/stories/mod.rs

@@ -1 +0,0 @@
-