Restructure storybook modules and components

Nate Butler and Piotr Osiewicz created 2 years ago

Co-Authored-By: Piotr Osiewicz <[e-mail]>

Change summary

crates/storybook/src/component/mod.rs          | 2 --
crates/storybook/src/components.rs             | 6 ++++++
crates/storybook/src/components/icon_button.rs | 2 +-
crates/storybook/src/components/tab.rs         | 2 +-
crates/storybook/src/module/mod.rs             | 1 -
crates/storybook/src/modules.rs                | 3 +++
crates/storybook/src/modules/tab_bar.rs        | 3 +--
crates/storybook/src/storybook.rs              | 3 +--
crates/storybook/src/workspace.rs              | 2 +-
9 files changed, 14 insertions(+), 10 deletions(-)

Detailed changes

crates/storybook/src/component/mod.rs

@@ -1,2 +0,0 @@
-pub(crate) mod icon_button;
-pub(crate) mod tab;

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<V, D> {
     click: Option<Rc<dyn Fn(&mut V, &D, &mut EventContext<V>)>>,
 }

crates/storybook/src/component/icon_button.rs → 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,
 }

crates/storybook/src/component/tab.rs → 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,
 }

crates/storybook/src/module/mod.rs

@@ -1 +0,0 @@
-pub(crate) mod tab_bar;

crates/storybook/src/modules.rs

@@ -0,0 +1,3 @@
+mod tab_bar;
+
+pub(crate) use tab_bar::tab_bar;

crates/storybook/src/module/tab_bar.rs → 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;

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;
 

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},