diff --git a/crates/storybook/src/component/mod.rs b/crates/storybook/src/component/mod.rs deleted file mode 100644 index c45b936e96..0000000000 --- a/crates/storybook/src/component/mod.rs +++ /dev/null @@ -1,2 +0,0 @@ -pub(crate) mod icon_button; -pub(crate) mod tab; diff --git a/crates/storybook/src/components.rs b/crates/storybook/src/components.rs index 1aafefc1a6..d07c2651a0 100644 --- a/crates/storybook/src/components.rs +++ b/crates/storybook/src/components.rs @@ -4,6 +4,12 @@ use gpui2::{ }; use std::{marker::PhantomData, rc::Rc}; +mod icon_button; +mod tab; + +pub(crate) use icon_button::{icon_button, ButtonVariant}; +pub(crate) use tab::tab; + struct ButtonHandlers { click: Option)>>, } diff --git a/crates/storybook/src/component/icon_button.rs b/crates/storybook/src/components/icon_button.rs similarity index 97% rename from crates/storybook/src/component/icon_button.rs rename to crates/storybook/src/components/icon_button.rs index 91c61b363d..5cdddd655a 100644 --- a/crates/storybook/src/component/icon_button.rs +++ b/crates/storybook/src/components/icon_button.rs @@ -5,7 +5,7 @@ use gpui2::{elements::div, IntoElement}; use gpui2::{Element, ParentElement, ViewContext}; #[derive(Element)] -struct IconButton { +pub(crate) struct IconButton { path: &'static str, variant: ButtonVariant, } diff --git a/crates/storybook/src/component/tab.rs b/crates/storybook/src/components/tab.rs similarity index 98% rename from crates/storybook/src/component/tab.rs rename to crates/storybook/src/components/tab.rs index 4aae374f80..eeb4a0b8a6 100644 --- a/crates/storybook/src/component/tab.rs +++ b/crates/storybook/src/components/tab.rs @@ -4,7 +4,7 @@ use gpui2::{elements::div, IntoElement}; use gpui2::{Element, ParentElement, ViewContext}; #[derive(Element)] -struct Tab { +pub(crate) struct Tab { title: &'static str, active: bool, } diff --git a/crates/storybook/src/module/mod.rs b/crates/storybook/src/module/mod.rs deleted file mode 100644 index 078db8e167..0000000000 --- a/crates/storybook/src/module/mod.rs +++ /dev/null @@ -1 +0,0 @@ -pub(crate) mod tab_bar; diff --git a/crates/storybook/src/modules.rs b/crates/storybook/src/modules.rs new file mode 100644 index 0000000000..bc8ba73b08 --- /dev/null +++ b/crates/storybook/src/modules.rs @@ -0,0 +1,3 @@ +mod tab_bar; + +pub(crate) use tab_bar::tab_bar; diff --git a/crates/storybook/src/module/tab_bar.rs b/crates/storybook/src/modules/tab_bar.rs similarity index 96% rename from crates/storybook/src/module/tab_bar.rs rename to crates/storybook/src/modules/tab_bar.rs index 8dc2e8cfd4..75bc7e86d6 100644 --- a/crates/storybook/src/module/tab_bar.rs +++ b/crates/storybook/src/modules/tab_bar.rs @@ -1,7 +1,6 @@ use std::marker::PhantomData; -use crate::component::icon_button::{icon_button, ButtonVariant}; -use crate::component::tab::tab; +use crate::components::{icon_button, tab, ButtonVariant}; use crate::theme::theme; use gpui2::elements::div::ScrollState; use gpui2::style::StyleHelpers; diff --git a/crates/storybook/src/storybook.rs b/crates/storybook/src/storybook.rs index 1d44129ea8..1b40bc2dc4 100644 --- a/crates/storybook/src/storybook.rs +++ b/crates/storybook/src/storybook.rs @@ -10,10 +10,9 @@ use settings::{default_settings, SettingsStore}; use simplelog::SimpleLogger; mod collab_panel; -mod component; mod components; mod element_ext; -mod module; +mod modules; mod theme; mod workspace; diff --git a/crates/storybook/src/workspace.rs b/crates/storybook/src/workspace.rs index ca55f9d3cc..b2d71608fe 100644 --- a/crates/storybook/src/workspace.rs +++ b/crates/storybook/src/workspace.rs @@ -1,4 +1,4 @@ -use crate::{collab_panel::collab_panel, module::tab_bar::tab_bar, theme::theme}; +use crate::{collab_panel::collab_panel, modules::tab_bar, theme::theme}; use gpui2::{ elements::{div, div::ScrollState, img, svg}, style::{StyleHelpers, Styleable},